diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/development/libraries/git2 | |
parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/git2')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/git2/0.27.nix | 36 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/git2/default.nix | 23 |
2 files changed, 11 insertions, 48 deletions
diff --git a/nixpkgs/pkgs/development/libraries/git2/0.27.nix b/nixpkgs/pkgs/development/libraries/git2/0.27.nix deleted file mode 100644 index 510f53f24b17..000000000000 --- a/nixpkgs/pkgs/development/libraries/git2/0.27.nix +++ /dev/null @@ -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; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/git2/default.nix b/nixpkgs/pkgs/development/libraries/git2/default.nix index 358fc31fc80f..514d21def1e0 100644 --- a/nixpkgs/pkgs/development/libraries/git2/default.nix +++ b/nixpkgs/pkgs/development/libraries/git2/default.nix @@ -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) { -}) +} |