public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81496 from r-ryantm/auto-update/libgit2

Browse Source 
libgit2: 0.28.4 -> 0.99.0
This commit is contained in:
Jan Tojnar 2020-03-09 23:11:30 +01:00 committed by GitHub
commit 6301e0af06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/git2/default.nix
View File

@ -5,17 +5,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libgit2"; pname = "libgit2";
version = "0.28.4"; version = "0.99.0";
# keep the version in sync with python3.pkgs.pygit2 and libgit2-glib # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libgit2"; owner = "libgit2";
repo = "libgit2"; repo = "libgit2";
rev = "v${version}"; rev = "v${version}";
sha256 = "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1"; sha256 = "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg";
}; };
cmakeFlags = [ "-DTHREADSAFE=ON" ]; cmakeFlags = [
"-DTHREADSAFE=ON"
"-DUSE_HTTP_PARSER=system"
];
nativeBuildInputs = [ cmake python3 pkgconfig ]; nativeBuildInputs = [ cmake python3 pkgconfig ];
@ -30,7 +33,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "The Git linkable library"; description = "The Git linkable library";
homepage = https://libgit2.github.com/; homepage = "https://libgit2.github.com/";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; all; platforms = with stdenv.lib.platforms; all;
}; };

6
pkgs/development/libraries/libgit2-glib/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libgit2-glib"; pname = "libgit2-glib";
version = "0.28.0.1"; version = "0.99.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7"; sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0";
}; };
postPatch = '' postPatch = ''
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A glib wrapper library around the libgit2 git access library"; 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; license = licenses.lgpl21;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
platforms = platforms.linux; platforms = platforms.linux;

14
pkgs/development/python-modules/pygit2/default.nix
View File

@ -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 { buildPythonPackage rec {
pname = "pygit2"; pname = "pygit2";
version = "1.0.3"; version = "1.1.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1ql7hkcxrh8yszglrg7d3y0ivh1l56xdc3j34j2fjy4qq06ifv6y"; sha256 = "klXVB9XYe/It/VeZeniQgBAzH8IfmoPsoSGlP2V76zw=";
}; };
preConfigure = lib.optionalString stdenv.isDarwin '' preConfigure = lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH="${libgit2}/lib" export DYLD_LIBRARY_PATH="${libgit2}/lib"
''; '';
propagatedBuildInputs = [ libgit2 ] ++ lib.optional (!isPyPy) cffi; buildInputs = [
libgit2
];
propagatedBuildInputs = [
cached-property
] ++ lib.optional (!isPyPy) cffi;
checkInputs = [ pytestCheckHook ]; checkInputs = [ pytestCheckHook ];