public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: 2.18.0 -> 2.19.0 (#46723)

Browse Source
This commit is contained in:
Andrew Childs 2018-09-19 00:54:22 +09:00 committed by xeji
parent f9396010a5
commit 50454ec5f1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport; assert svnSupport -> perlSupport;
let let
version = "2.18.0"; version = "2.19.0";
svn = subversionClient.override { perlBindings = perlSupport; }; svn = subversionClient.override { perlBindings = perlSupport; };
in in
@ -29,7 +29,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; sha256 = "1x1y5z3awabmfg7hk6zb331jxngad4nal4507v96bnf0izsyy3qq";
}; };
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
@ -283,7 +283,7 @@ EOF
# XXX: I failed to understand why this one fails. # XXX: I failed to understand why this one fails.
# Could someone try to re-enable it on the next release ? # 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" disable_test t1700-split-index "null sha1"
# Tested to fail: 2.18.0 # Tested to fail: 2.18.0
@ -292,6 +292,9 @@ EOF
# Tested to fail: 2.18.0 # Tested to fail: 2.18.0
disable_test t9902-completion "sourcing the completion script clears cached --options" 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 '' '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
# Test fails (as of 2.17.0, musl 1.1.19) # Test fails (as of 2.17.0, musl 1.1.19)
disable_test t3900-i18n-commit disable_test t3900-i18n-commit