diff options
author | Will Dietz <w@wdtz.org> | 2018-06-24 22:36:50 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-06-24 22:36:50 -0500 |
commit | 6d1955e0c49720074505e090dac8b576a77efdd0 (patch) | |
tree | 4ebbf5563caa967dd46b376ffdc002625f192801 /pkgs/applications/version-management/git-and-tools | |
parent | 779d64f43d664392e057e4591c5c85d5ad4a5c94 (diff) | |
download | nixlib-6d1955e0c49720074505e090dac8b576a77efdd0.tar nixlib-6d1955e0c49720074505e090dac8b576a77efdd0.tar.gz nixlib-6d1955e0c49720074505e090dac8b576a77efdd0.tar.bz2 nixlib-6d1955e0c49720074505e090dac8b576a77efdd0.tar.lz nixlib-6d1955e0c49720074505e090dac8b576a77efdd0.tar.xz nixlib-6d1955e0c49720074505e090dac8b576a77efdd0.tar.zst nixlib-6d1955e0c49720074505e090dac8b576a77efdd0.zip |
Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0"
This reverts commit 2624f9079617df6b1fffda8c10f6a7a35068ecdc, reversing changes made to 37aab4cbb5552bf021b20cf05d64e8ded6f3538a. See: https://github.com/NixOS/nixpkgs/pull/42376#issuecomment-399789096 Basically this breaks at least some users of fetchgit, so let's revert this until this is sorted out.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch | 13 |
2 files changed, 16 insertions, 13 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 522a6fcd6a12..4e9b7d2428de 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.18.0"; + version = "2.17.1"; svn = subversionClient.override { perlBindings = perlSupport; }; in @@ -27,7 +27,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; + sha256 = "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; @@ -40,6 +40,7 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch + ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch ./git-send-email-honor-PATH.patch @@ -276,21 +277,10 @@ 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 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 '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit - # Fails largely due to assumptions about BOM - # Tested to fail: 2.18.0 - disable_test t0028-working-tree-encoding ''; diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch new file mode 100644 index 000000000000..0a581a61d46d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch @@ -0,0 +1,13 @@ +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; \ + } && \ |