Skip to content

Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0" #42549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtzWill merged 1 commit into from
Jun 25, 2018
Merged

Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0" #42549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions pkgs/applications/version-management/git-and-tools/git/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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";
Expand All @@ -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
Expand Down Expand Up @@ -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
'';


Expand Down
13 changes: 13 additions & 0 deletions pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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; \
} && \