Skip to content

Commit 6301e0a

Browse files
authored
Merge pull request #81496 from r-ryantm/auto-update/libgit2
libgit2: 0.28.4 -> 0.99.0
2 parents dc55150 + b0be937 commit 6301e0a

3 files changed

Lines changed: 20 additions & 11 deletions

File tree

pkgs/development/libraries/git2/default.nix

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,20 @@
55

66
stdenv.mkDerivation rec {
77
pname = "libgit2";
8-
version = "0.28.4";
8+
version = "0.99.0";
99
# keep the version in sync with python3.pkgs.pygit2 and libgit2-glib
1010

1111
src = fetchFromGitHub {
1212
owner = "libgit2";
1313
repo = "libgit2";
1414
rev = "v${version}";
15-
sha256 = "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1";
15+
sha256 = "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg";
1616
};
1717

18-
cmakeFlags = [ "-DTHREADSAFE=ON" ];
18+
cmakeFlags = [
19+
"-DTHREADSAFE=ON"
20+
"-DUSE_HTTP_PARSER=system"
21+
];
1922

2023
nativeBuildInputs = [ cmake python3 pkgconfig ];
2124

@@ -30,7 +33,7 @@ stdenv.mkDerivation rec {
3033

3134
meta = {
3235
description = "The Git linkable library";
33-
homepage = https://libgit2.github.com/;
36+
homepage = "https://libgit2.github.com/";
3437
license = stdenv.lib.licenses.gpl2;
3538
platforms = with stdenv.lib.platforms; all;
3639
};

pkgs/development/libraries/libgit2-glib/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
stdenv.mkDerivation rec {
55
pname = "libgit2-glib";
6-
version = "0.28.0.1";
6+
version = "0.99.0.1";
77

88
src = fetchurl {
99
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10-
sha256 = "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7";
10+
sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0";
1111
};
1212

1313
postPatch = ''
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040

4141
meta = with stdenv.lib; {
4242
description = "A glib wrapper library around the libgit2 git access library";
43-
homepage = https://wiki.gnome.org/Projects/Libgit2-glib;
43+
homepage = "https://wiki.gnome.org/Projects/Libgit2-glib";
4444
license = licenses.lgpl21;
4545
maintainers = gnome3.maintainers;
4646
platforms = platforms.linux;

pkgs/development/python-modules/pygit2/default.nix

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
1-
{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, pytestCheckHook, cffi, cacert }:
1+
{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, cached-property, pytestCheckHook, cffi, cacert }:
22

33
buildPythonPackage rec {
44
pname = "pygit2";
5-
version = "1.0.3";
5+
version = "1.1.1";
66

77
src = fetchPypi {
88
inherit pname version;
9-
sha256 = "1ql7hkcxrh8yszglrg7d3y0ivh1l56xdc3j34j2fjy4qq06ifv6y";
9+
sha256 = "klXVB9XYe/It/VeZeniQgBAzH8IfmoPsoSGlP2V76zw=";
1010
};
1111

1212
preConfigure = lib.optionalString stdenv.isDarwin ''
1313
export DYLD_LIBRARY_PATH="${libgit2}/lib"
1414
'';
1515

16-
propagatedBuildInputs = [ libgit2 ] ++ lib.optional (!isPyPy) cffi;
16+
buildInputs = [
17+
libgit2
18+
];
19+
20+
propagatedBuildInputs = [
21+
cached-property
22+
] ++ lib.optional (!isPyPy) cffi;
1723

1824
checkInputs = [ pytestCheckHook ];
1925

0 commit comments

Comments
 (0)