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

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

Browse Source 
libgit2: 0.27.8 -> 0.28.4
This commit is contained in:
Jan Tojnar 2020-02-10 19:59:25 +01:00 committed by GitHub
commit 5ff9a68101
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,25 +1,25 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python3
, zlib, libssh2, openssl, http-parser, curl
, zlib, libssh2, openssl, http-parser
, libiconv, Security
}:
stdenv.mkDerivation rec {
pname = "libgit2";
version = "0.27.8";
# keep the version in sync with pythonPackages.pygit2 and libgit2-glib
version = "0.28.4";
# keep the version in sync with python3.pkgs.pygit2 and libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9";
sha256 = "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];
nativeBuildInputs = [ cmake python3 pkgconfig ];
buildInputs = [ zlib libssh2 openssl http-parser curl ]
buildInputs = [ zlib libssh2 openssl http-parser ]
++ stdenv.lib.optional stdenv.isDarwin Security;
propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;

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

@ -1,25 +1,21 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, isPyPy, libgit2, six, cffi }:
{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, pytestCheckHook, cffi, cacert }:
buildPythonPackage rec {
pname = "pygit2";
version = "0.27.2";
version = "1.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "0d9bgxd6ch5jxz0j5cmx7c4kw933g8pgm2zxf3id1a6w9g2r7hpw";
sha256 = "1ql7hkcxrh8yszglrg7d3y0ivh1l56xdc3j34j2fjy4qq06ifv6y";
};
preConfigure = lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH="${libgit2}/lib"
'';
patches = [ (fetchpatch {
name = "dont-require-old-pycparser"; # https://github.com/libgit2/pygit2/issues/819
url = https://github.com/libgit2/pygit2/commit/1eaba181577de206d3d43ec7886d0353fc0c9f2a.patch;
sha256 = "18x1fpmywhjjr4lvakwmy34zpxfqi8pqqj48g1wcib39lh3s7l4f";
}) ];
propagatedBuildInputs = [ libgit2 ] ++ lib.optional (!isPyPy) cffi;
propagatedBuildInputs = [ libgit2 six ] ++ lib.optional (!isPyPy) cffi;
checkInputs = [ pytestCheckHook ];
preCheck = ''
# disable tests that require networking
@ -28,6 +24,20 @@ buildPythonPackage rec {
rm test/test_submodule.py
'';
# Tests require certificates
# https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
# setup.py check is broken
# https://github.com/libgit2/pygit2/issues/868
dontUseSetuptoolsCheck = true;
# TODO: Test collection is failing
# https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068
doCheck = false;
disabled = !isPy3k;
meta = with lib; {
description = "A set of Python bindings to the libgit2 shared library";
homepage = https://pypi.python.org/pypi/pygit2;

8
pkgs/tools/filesystems/gitfs/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python2Packages }:
{ stdenv, fetchFromGitHub, python3Packages }:
python2Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "gitfs";
version = "0.5.2";
@ -16,8 +16,8 @@ python2Packages.buildPythonApplication rec {
echo > requirements.txt
'';
buildInputs = with python2Packages; [ pytest pytestcov mock ];
propagatedBuildInputs = with python2Packages; [ atomiclong fusepy pygit2 ];
checkInputs = with python3Packages; [ pytest pytestcov mock ];
propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ];
checkPhase = "py.test";
doCheck = false;