diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
| commit | ef93931efff0323fd13c4270415b578c73b5ef35 (patch) | |
| tree | e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs/pkgs/applications/version-management/git-and-tools/git | |
| parent | c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff) | |
| parent | a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff) | |
| download | nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2 nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip | |
Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/git-and-tools/git')
| -rw-r--r-- | nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index c76b82ffe6d4..3acfd4bc4001 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.21.0"; + version = "2.22.0"; svn = subversionClient.override { perlBindings = perlSupport; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc"; + sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; @@ -96,7 +96,9 @@ stdenv.mkDerivation { postBuild = '' make -C contrib/subtree - '' + (stdenv.lib.optionalString stdenv.isDarwin '' + '' + (stdenv.lib.optionalString perlSupport '' + make -C contrib/diff-highlight + '') + (stdenv.lib.optionalString stdenv.isDarwin '' make -C contrib/credential/osxkeychain '') + (stdenv.lib.optionalString withLibsecret '' make -C contrib/credential/libsecret |