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

libgit2: remove 0.26, default to 0.27

Browse Source
This commit is contained in:
Franz Pletz
2019-06-17 09:47:10 +02:00
committed by Frederik Rietdijk
parent 6daac686c5
commit 10812379fa
6 changed files with 19 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,36 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python
, zlib, libssh2, openssl, http-parser, curl
, libiconv, Security
}:
stdenv.mkDerivation rec {
version = "0.27.8";
name = "libgit2-${version}";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9";
};
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;
};
}

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

@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake
, zlib, python, libssh2, openssl, curl, http-parser
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python
, zlib, libssh2, openssl, http-parser, curl
, libiconv, Security
}:
stdenv.mkDerivation (rec {
name = "libgit2-${version}";
version = "0.26.6";
stdenv.mkDerivation rec {
pname = "libgit2";
version = "0.27.8";
# keep the version in sync with pythonPackages.pygit2 and libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3";
sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];
@@ -22,17 +22,16 @@ 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;
doCheck = false; # hangs. or very expensive?
meta = with stdenv.lib; {
meta = {
description = "The Git linkable library";
homepage = https://libgit2.github.com/;
license = licenses.gpl2;
platforms = with platforms; all;
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; all;
};
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
})
}