diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-14 16:37:53 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-16 22:56:31 +0100 |
commit | cc506381761d84bd0047cabba7151ad516fa8a32 (patch) | |
tree | 58ebe417a5f61e8c1e53d3904e8e3d162864cc07 /pkgs/development/libraries/git2/default.nix | |
parent | 976cf1498397a5f7af8a30aa4106568fc5b3cf5d (diff) | |
download | nixpkgs-cc506381761d84bd0047cabba7151ad516fa8a32.tar nixpkgs-cc506381761d84bd0047cabba7151ad516fa8a32.tar.gz nixpkgs-cc506381761d84bd0047cabba7151ad516fa8a32.tar.bz2 nixpkgs-cc506381761d84bd0047cabba7151ad516fa8a32.tar.lz nixpkgs-cc506381761d84bd0047cabba7151ad516fa8a32.tar.xz nixpkgs-cc506381761d84bd0047cabba7151ad516fa8a32.tar.zst nixpkgs-cc506381761d84bd0047cabba7151ad516fa8a32.zip |
libgit2: 0.26.6 → 0.27.7
Diffstat (limited to 'pkgs/development/libraries/git2/default.nix')
-rw-r--r-- | pkgs/development/libraries/git2/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 358fc31fc80..ec610d1e565 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/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.7"; # keep the version in sync with pythonPackages.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3"; + sha256 = "1q3mp7xjpbmdsnk4sdzf2askbb4pgbxcmr1h7y7zk2738dndwkha"; }; 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,5 +34,4 @@ stdenv.mkDerivation (rec { license = licenses.gpl2; platforms = with platforms; all; }; -} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { -}) +} |