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

Revert "libgit2: 0.26.6 → 0.27.7"

Browse Source 
This reverts commit cc50638176 because
it breaks cargo (again, see fca4fbeba9):

  $ cargo build
      Updating crates.io index
  Segmentation fault
This commit is contained in:
Eelco Dolstra
2019-01-11 10:45:23 +01:00
parent 10b50b661b
commit ac97ba25ae
5 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/development/libraries/git2/0.27.nix Normal file
View File

@@ -0,0 +1,36 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python
, zlib, libssh2, openssl, http-parser, curl
, libiconv, Security
}:
stdenv.mkDerivation rec {
version = "0.27.7";
name = "libgit2-${version}";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "1q3mp7xjpbmdsnk4sdzf2askbb4pgbxcmr1h7y7zk2738dndwkha";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];
nativeBuildInputs = [ cmake python pkgconfig ];
buildInputs = [ zlib libssh2 openssl http-parser curl ]
++ stdenv.lib.optional stdenv.isDarwin Security;
propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
enableParallelBuilding = true;
doCheck = false; # hangs. or very expensive?
meta = {
description = "The Git linkable library";
homepage = https://libgit2.github.com/;
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; all;
};
}

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

@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python
, zlib, libssh2, openssl, http-parser, curl
{ stdenv, fetchFromGitHub, pkgconfig, cmake
, zlib, python, libssh2, openssl, curl, http-parser
, libiconv, Security
}:
stdenv.mkDerivation rec {
pname = "libgit2";
version = "0.27.7";
stdenv.mkDerivation (rec {
name = "libgit2-${version}";
version = "0.26.6";
# keep the version in sync with pythonPackages.pygit2 and libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "1q3mp7xjpbmdsnk4sdzf2askbb4pgbxcmr1h7y7zk2738dndwkha";
sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib libssh2 openssl http-parser curl ]
++ stdenv.lib.optional stdenv.isDarwin Security;
propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) [ libiconv ];
enableParallelBuilding = true;
@@ -34,4 +34,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = with platforms; all;
};
}
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
})