pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #38636 from layus/git-2.17.0

git: 2.16.2 -> 2.17.0

authored by Peter Simons and committed by GitHub 1cdcc192 c78c7645

+21 -23
unified split
+2 -2
pkgs/applications/version-management/git-and-tools/git/default.nix
··· 13 }: 14 15 let 16 - version = "2.16.2"; 17 svn = subversionClient.override { perlBindings = true; }; 18 in 19 ··· 22 23 src = fetchurl { 24 url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; 25 - sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m"; 26 }; 27 28 hardeningDisable = [ "format" ];
··· 13 }: 14 15 let 16 + version = "2.17.0"; 17 svn = subversionClient.override { perlBindings = true; }; 18 in 19 ··· 22 23 src = fetchurl { 24 url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; 25 + sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; 26 }; 27 28 hardeningDisable = [ "format" ];
+8 -8
pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
··· 2 and (2) make sure `gitman.info' isn't produced since it's broken (duplicate 3 node names). 4 5 - diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile 6 - --- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200 7 - +++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200 8 - @@ -101,7 +101,7 @@ 9 10 MAKEINFO = makeinfo 11 INSTALL_INFO = install-info 12 -DOCBOOK2X_TEXI = docbook2x-texi 13 +DOCBOOK2X_TEXI = docbook2texi 14 DBLATEX = dblatex 15 - ifndef PERL_PATH 16 - PERL_PATH = /usr/bin/perl 17 - @@ -205,7 +205,7 @@ 18 man5: $(DOC_MAN5) 19 man7: $(DOC_MAN7) 20 ··· 23 24 pdf: user-manual.pdf 25 26 - @@ -221,10 +221,9 @@ 27 28 install-info: info 29 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
··· 2 and (2) make sure `gitman.info' isn't produced since it's broken (duplicate 3 node names). 4 5 + diff --git a/Documentation/Makefile b/Documentation/Makefile 6 + --- a/Documentation/Makefile 7 + +++ b/Documentation/Makefile 8 + @@ -122,7 +122,7 @@ 9 10 MAKEINFO = makeinfo 11 INSTALL_INFO = install-info 12 -DOCBOOK2X_TEXI = docbook2x-texi 13 +DOCBOOK2X_TEXI = docbook2texi 14 DBLATEX = dblatex 15 + ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex 16 + DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty 17 + @@ -240,7 +240,7 @@ 18 man5: $(DOC_MAN5) 19 man7: $(DOC_MAN7) 20 ··· 23 24 pdf: user-manual.pdf 25 26 + @@ -256,10 +256,9 @@ 27 28 install-info: info 29 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
+3 -5
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
··· 1 diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt 2 - index 8060ea35c..c81067a19 100644 3 --- a/Documentation/git-send-email.txt 4 +++ b/Documentation/git-send-email.txt 5 - @@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. 6 specify a full pathname of a sendmail-like program instead; 7 the program must support the `-i` option. Default value can 8 be specified by the `sendemail.smtpServer` configuration 9 - option; the built-in default is to search for `sendmail` in 10 - `/usr/sbin`, `/usr/lib` and $PATH if such program is 11 - + option; the built-in default is to search in $PATH if such program is 12 available, falling back to `localhost` otherwise. 13 14 --smtp-server-port=<port>:: 15 diff --git a/git-send-email.perl b/git-send-email.perl 16 - index edcc6d346..8e357aeab 100755 17 --- a/git-send-email.perl 18 +++ b/git-send-email.perl 19 - @@ -885,8 +885,7 @@ if (defined $initial_reply_to) { 20 } 21 22 if (!defined $smtp_server) {
··· 1 diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt 2 --- a/Documentation/git-send-email.txt 3 +++ b/Documentation/git-send-email.txt 4 + @@ -208,8 +208,7 @@ a password is obtained using 'git-credential'. 5 specify a full pathname of a sendmail-like program instead; 6 the program must support the `-i` option. Default value can 7 be specified by the `sendemail.smtpServer` configuration 8 - option; the built-in default is to search for `sendmail` in 9 - `/usr/sbin`, `/usr/lib` and $PATH if such program is 10 + + option; the built-in default is to search in $PATH if such program is 11 available, falling back to `localhost` otherwise. 12 13 --smtp-server-port=<port>:: 14 diff --git a/git-send-email.perl b/git-send-email.perl 15 --- a/git-send-email.perl 16 +++ b/git-send-email.perl 17 + @@ -944,8 +944,7 @@ if (defined $reply_to) { 18 } 19 20 if (!defined $smtp_server) {
+4 -4
pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
··· 6 7 -# First decide what scheme to use... 8 -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough 9 - -if test -n "@@USE_GETTEXT_SCHEME@@" 10 -then 11 - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" 12 -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" 13 -then 14 - : no probing necessary 15 - -elif test -n "$GIT_GETTEXT_POISON" 16 - -then 17 - - GIT_INTERNAL_GETTEXT_SH_SCHEME=poison 18 -elif type gettext.sh >/dev/null 2>&1 19 -then 20 - # GNU libintl's gettext.sh
··· 6 7 -# First decide what scheme to use... 8 -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough 9 + -if test -n "$GIT_GETTEXT_POISON" 10 + -then 11 + - GIT_INTERNAL_GETTEXT_SH_SCHEME=poison 12 + -elif test -n "@@USE_GETTEXT_SCHEME@@" 13 -then 14 - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" 15 -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" 16 -then 17 - : no probing necessary 18 -elif type gettext.sh >/dev/null 2>&1 19 -then 20 - # GNU libintl's gettext.sh