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

Merge pull request #38636 from layus/git-2.17.0

Browse Source 
git: 2.16.2 -> 2.17.0
This commit is contained in:
Peter Simons 2018-04-09 14:02:18 +02:00 committed by GitHub
commit 1cdcc19218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@
}: }:
let let
version = "2.16.2"; version = "2.17.0";
svn = subversionClient.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
in in
@ -22,7 +22,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 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m"; sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

16
pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
View File

@ -2,19 +2,19 @@ This patch does two things: (1) use the right name for `docbook2texi',
and (2) make sure `gitman.info' isn't produced since it's broken (duplicate and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
node names). node names).
diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile diff --git a/Documentation/Makefile b/Documentation/Makefile
--- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200 --- a/Documentation/Makefile
+++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200 +++ b/Documentation/Makefile
@@ -101,7 +101,7 @@ @@ -122,7 +122,7 @@
MAKEINFO = makeinfo MAKEINFO = makeinfo
INSTALL_INFO = install-info INSTALL_INFO = install-info
-DOCBOOK2X_TEXI = docbook2x-texi -DOCBOOK2X_TEXI = docbook2x-texi
+DOCBOOK2X_TEXI = docbook2texi +DOCBOOK2X_TEXI = docbook2texi
DBLATEX = dblatex DBLATEX = dblatex
ifndef PERL_PATH ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
PERL_PATH = /usr/bin/perl DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
@@ -205,7 +205,7 @@ @@ -240,7 +240,7 @@
man5: $(DOC_MAN5) man5: $(DOC_MAN5)
man7: $(DOC_MAN7) man7: $(DOC_MAN7)
@ -23,7 +23,7 @@ diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile
pdf: user-manual.pdf pdf: user-manual.pdf
@@ -221,10 +221,9 @@ @@ -256,10 +256,9 @@
install-info: info install-info: info
$(INSTALL) -d -m 755 $(DESTDIR)$(infodir) $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)

6
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
View File

@ -1,8 +1,7 @@
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 8060ea35c..c81067a19 100644
--- a/Documentation/git-send-email.txt --- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt
@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. @@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
specify a full pathname of a sendmail-like program instead; specify a full pathname of a sendmail-like program instead;
the program must support the `-i` option. Default value can the program must support the `-i` option. Default value can
be specified by the `sendemail.smtpServer` configuration be specified by the `sendemail.smtpServer` configuration
@ -13,10 +12,9 @@ index 8060ea35c..c81067a19 100644
--smtp-server-port=<port>:: --smtp-server-port=<port>::
diff --git a/git-send-email.perl b/git-send-email.perl diff --git a/git-send-email.perl b/git-send-email.perl
index edcc6d346..8e357aeab 100755
--- a/git-send-email.perl --- a/git-send-email.perl
+++ b/git-send-email.perl +++ b/git-send-email.perl
@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { @@ -944,8 +944,7 @@ if (defined $reply_to) {
} }
if (!defined $smtp_server) { if (!defined $smtp_server) {

8
pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
View File

@ -6,15 +6,15 @@
-# First decide what scheme to use... -# First decide what scheme to use...
-GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "@@USE_GETTEXT_SCHEME@@" -if test -n "$GIT_GETTEXT_POISON"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-elif test -n "@@USE_GETTEXT_SCHEME@@"
-then -then
- GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
-elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
-then -then
- : no probing necessary - : no probing necessary
-elif test -n "$GIT_GETTEXT_POISON"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-elif type gettext.sh >/dev/null 2>&1 -elif type gettext.sh >/dev/null 2>&1
-then -then
- # GNU libintl's gettext.sh - # GNU libintl's gettext.sh

8
pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
View File

@ -1,7 +1,7 @@
diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile diff --git a/Makefile b/Makefile
--- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200 --- a/Makefile
+++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200 +++ b/Makefile
@@ -2319,8 +2319,7 @@ @@ -2609,8 +2609,7 @@
{ test "$$bindir/" = "$$execdir/" || \ { test "$$bindir/" = "$$execdir/" || \
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
$(RM) "$$execdir/$$p" && \ $(RM) "$$execdir/$$p" && \