From 6733ecede5e86371e931f43115dd16598785a87f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Mar 2020 23:01:23 +0100 Subject: [PATCH 1/3] libgit2: 0.28.4 -> 0.99.0 https://github.com/libgit2/libgit2/releases/tag/v0.99.0 --- pkgs/development/libraries/git2/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index ed32f68635b0b..873865cdf8379 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -5,17 +5,20 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "0.28.4"; + version = "0.99.0"; # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1"; + sha256 = "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg"; }; - cmakeFlags = [ "-DTHREADSAFE=ON" ]; + cmakeFlags = [ + "-DTHREADSAFE=ON" + "-DUSE_HTTP_PARSER=system" + ]; nativeBuildInputs = [ cmake python3 pkgconfig ]; @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "The Git linkable library"; - homepage = https://libgit2.github.com/; + homepage = "https://libgit2.github.com/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; From 6a23ca8c8527a7042a31292b6fd47ffcdf76bb21 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 Feb 2020 23:12:49 +0000 Subject: [PATCH 2/3] libgit2-glib: 0.28.0.1 -> 0.99.0.1 https://ftp.gnome.org/pub/GNOME/sources/libgit2-glib/0.99/libgit2-glib-0.99.0.1.news --- pkgs/development/libraries/libgit2-glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index d5edefc5d54b4..f3e07b509176c 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "0.28.0.1"; + version = "0.99.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7"; + sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0"; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A glib wrapper library around the libgit2 git access library"; - homepage = https://wiki.gnome.org/Projects/Libgit2-glib; + homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; license = licenses.lgpl21; maintainers = gnome3.maintainers; platforms = platforms.linux; From b0be93769ba339f037c62c8fa13955d04648914e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Mar 2020 23:06:56 +0100 Subject: [PATCH 3/3] =?UTF-8?q?python3.pkgs.pygit2:=201.0.3=20=E2=86=92=20?= =?UTF-8?q?1.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/libgit2/pygit2/compare/v1.0.3...v1.1.1#diff-de0a9b67ffe2874a076b5fdb15bad484 --- pkgs/development/python-modules/pygit2/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index cd2994a4dc0f8..013ce9ae91624 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, pytestCheckHook, cffi, cacert }: +{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, cached-property, pytestCheckHook, cffi, cacert }: buildPythonPackage rec { pname = "pygit2"; - version = "1.0.3"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1ql7hkcxrh8yszglrg7d3y0ivh1l56xdc3j34j2fjy4qq06ifv6y"; + sha256 = "klXVB9XYe/It/VeZeniQgBAzH8IfmoPsoSGlP2V76zw="; }; preConfigure = lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; - propagatedBuildInputs = [ libgit2 ] ++ lib.optional (!isPyPy) cffi; + buildInputs = [ + libgit2 + ]; + + propagatedBuildInputs = [ + cached-property + ] ++ lib.optional (!isPyPy) cffi; checkInputs = [ pytestCheckHook ];