Revert "Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0""
This reverts commit 6d1955e0c4
.
This commit is contained in:
parent
ea23a1ed4e
commit
bb00076931
2 changed files with 13 additions and 16 deletions
|
@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport;
|
||||||
assert svnSupport -> perlSupport;
|
assert svnSupport -> perlSupport;
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.17.1";
|
version = "2.18.0";
|
||||||
svn = subversionClient.override { perlBindings = perlSupport; };
|
svn = subversionClient.override { perlBindings = perlSupport; };
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -27,7 +27,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 = "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr";
|
sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
|
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
|
||||||
|
@ -40,7 +40,6 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./docbook2texi.patch
|
./docbook2texi.patch
|
||||||
./symlinks-in-bin.patch
|
|
||||||
./git-sh-i18n.patch
|
./git-sh-i18n.patch
|
||||||
./ssh-path.patch
|
./ssh-path.patch
|
||||||
./git-send-email-honor-PATH.patch
|
./git-send-email-honor-PATH.patch
|
||||||
|
@ -277,10 +276,21 @@ 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
|
||||||
disable_test t1700-split-index "null sha1"
|
disable_test t1700-split-index "null sha1"
|
||||||
|
|
||||||
|
# Tested to fail: 2.18.0
|
||||||
|
disable_test t7005-editor "editor with a space"
|
||||||
|
disable_test t7005-editor "core.editor with a space"
|
||||||
|
|
||||||
|
# Tested to fail: 2.18.0
|
||||||
|
disable_test t9902-completion "sourcing the completion script clears cached --options"
|
||||||
'' + 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
|
||||||
|
# Fails largely due to assumptions about BOM
|
||||||
|
# Tested to fail: 2.18.0
|
||||||
|
disable_test t0028-working-tree-encoding
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -2609,8 +2609,7 @@
|
|
||||||
{ test "$$bindir/" = "$$execdir/" || \
|
|
||||||
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
|
|
||||||
$(RM) "$$execdir/$$p" && \
|
|
||||||
- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
|
|
||||||
- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
|
|
||||||
+ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
|
|
||||||
cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
|
|
||||||
done; \
|
|
||||||
} && \
|
|
Loading…
Reference in a new issue