diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-11-05 05:03:17 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-11-05 18:43:30 +0000 |
commit | ce1b0c05a52f70fbf03c277018384c9bac3fdf56 (patch) | |
tree | 7ea5eb4da737c3831c277fcbd67d88c099a66493 /pkgs/development/libraries/git2 | |
parent | 1aef6f40bbbe3348986058a12898e57afd4c0ba6 (diff) | |
download | nixpkgs-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar nixpkgs-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.gz nixpkgs-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.bz2 nixpkgs-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.lz nixpkgs-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.xz nixpkgs-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.zst nixpkgs-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.zip |
libgit2: 0.25.1 -> 0.26.0
Diffstat (limited to 'pkgs/development/libraries/git2')
-rw-r--r-- | pkgs/development/libraries/git2/0.25.nix | 43 | ||||
-rw-r--r-- | pkgs/development/libraries/git2/default.nix | 25 |
2 files changed, 50 insertions, 18 deletions
diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix new file mode 100644 index 00000000000..ecc6552d1b4 --- /dev/null +++ b/pkgs/development/libraries/git2/0.25.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, python +, zlib, libssh2, openssl, http-parser, curl, libiconv +}: + +stdenv.mkDerivation (rec { + version = "0.25.1"; + name = "libgit2-${version}"; + + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj"; + }; + + # TODO: `cargo` (rust's package manager) surfaced a serious bug in + # libgit2 when the `Security.framework` transport is used on Darwin. + # The upstream issue is tracked at + # https://github.com/libgit2/libgit2/issues/3885 - feel free to + # remove this patch as soon as it's resolved (i.E. when cargo is + # working fine without this patch) + patches = stdenv.lib.optionals stdenv.isDarwin [ + ./disable-security.framework.patch + ]; + + cmakeFlags = "-DTHREADSAFE=ON"; + + nativeBuildInputs = [ cmake python pkgconfig ]; + + buildInputs = [ zlib libssh2 openssl http-parser curl ]; + + enableParallelBuilding = true; + + meta = { + description = "The Git linkable library"; + homepage = https://libgit2.github.com/; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; all; + }; +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_LDFLAGS = "-liconv"; + propagatedBuildInputs = [ libiconv ]; +}) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index ecc6552d1b4..42cf181f84f 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,28 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, python -, zlib, libssh2, openssl, http-parser, curl, libiconv -}: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.25.1"; name = "libgit2-${version}"; + version = "0.26.0"; + # keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj"; + sha256 = "0zrrmfkfhd2xb4879z5khjb6xsdklrm01f1lscrs2ks68v25fk78"; }; - # TODO: `cargo` (rust's package manager) surfaced a serious bug in - # libgit2 when the `Security.framework` transport is used on Darwin. - # The upstream issue is tracked at - # https://github.com/libgit2/libgit2/issues/3885 - feel free to - # remove this patch as soon as it's resolved (i.E. when cargo is - # working fine without this patch) - patches = stdenv.lib.optionals stdenv.isDarwin [ - ./disable-security.framework.patch - ]; - cmakeFlags = "-DTHREADSAFE=ON"; nativeBuildInputs = [ cmake python pkgconfig ]; @@ -31,11 +20,11 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "The Git linkable library"; homepage = https://libgit2.github.com/; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; + license = licenses.gpl2; + platforms = with platforms; all; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { NIX_LDFLAGS = "-liconv"; |