diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2018-09-19 00:54:22 +0900 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-18 17:54:22 +0200 |
| commit | 50454ec5f17a2a1095de51907d0406eb6f8614dc (patch) | |
| tree | 4c9c6bbbc8a0495ffa81e700c8f79c1ff895e4f2 | |
| parent | f9396010a5007aa39c8f7ef4191528508e636ede (diff) | |
| download | nixlib-50454ec5f17a2a1095de51907d0406eb6f8614dc.tar nixlib-50454ec5f17a2a1095de51907d0406eb6f8614dc.tar.gz nixlib-50454ec5f17a2a1095de51907d0406eb6f8614dc.tar.bz2 nixlib-50454ec5f17a2a1095de51907d0406eb6f8614dc.tar.lz nixlib-50454ec5f17a2a1095de51907d0406eb6f8614dc.tar.xz nixlib-50454ec5f17a2a1095de51907d0406eb6f8614dc.tar.zst nixlib-50454ec5f17a2a1095de51907d0406eb6f8614dc.zip | |
git: 2.18.0 -> 2.19.0 (#46723)
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 6cc109c48c75..8bd6457a9e50 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.18.0"; + version = "2.19.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 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; + sha256 = "1x1y5z3awabmfg7hk6zb331jxngad4nal4507v96bnf0izsyy3qq"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; @@ -283,7 +283,7 @@ EOF # XXX: I failed to understand why this one fails. # Could someone try to re-enable it on the next release ? - # Tested to fail: 2.18.0 + # Tested to fail: 2.18.0 and 2.19.0 disable_test t1700-split-index "null sha1" # Tested to fail: 2.18.0 @@ -292,6 +292,9 @@ EOF # Tested to fail: 2.18.0 disable_test t9902-completion "sourcing the completion script clears cached --options" + + # As of 2.19.0, t5562 refers to #!/usr/bin/perl + patchShebangs t/t5562/invoke-with-content-length.pl '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit |