pyrox.dev
git: 2.16.3 -> 2.17.0
+2
-2
pkgs/applications/version-management/git-and-tools/git/default.nix
+2
-2
pkgs/applications/version-management/git-and-tools/git/default.nix
···
13
13
}:
14
14
15
15
let
16
-
version = "2.16.3";
16
+
version = "2.17.0";
17
17
svn = subversionClient.override { perlBindings = true; };
18
18
in
19
19
···
22
22
23
23
src = fetchurl {
24
24
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
25
-
sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";
25
+
sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9";
26
26
};
27
27
28
28
hardeningDisable = [ "format" ];
+8
-8
pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
+8
-8
pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
···
2
2
and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
3
3
node names).
4
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 @@
5
+
diff --git a/Documentation/Makefile b/Documentation/Makefile
6
+
--- a/Documentation/Makefile
7
+
+++ b/Documentation/Makefile
8
+
@@ -122,7 +122,7 @@
9
9
10
10
MAKEINFO = makeinfo
11
11
INSTALL_INFO = install-info
12
12
-DOCBOOK2X_TEXI = docbook2x-texi
13
13
+DOCBOOK2X_TEXI = docbook2texi
14
14
DBLATEX = dblatex
15
-
ifndef PERL_PATH
16
-
PERL_PATH = /usr/bin/perl
17
-
@@ -205,7 +205,7 @@
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
18
man5: $(DOC_MAN5)
19
19
man7: $(DOC_MAN7)
20
20
···
23
23
24
24
pdf: user-manual.pdf
25
25
26
-
@@ -221,10 +221,9 @@
26
+
@@ -256,10 +256,9 @@
27
27
28
28
install-info: info
29
29
$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
+3
-5
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
+3
-5
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
···
1
1
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
2
-
index 8060ea35c..c81067a19 100644
3
2
--- a/Documentation/git-send-email.txt
4
3
+++ b/Documentation/git-send-email.txt
5
-
@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'.
4
+
@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
6
5
specify a full pathname of a sendmail-like program instead;
7
6
the program must support the `-i` option. Default value can
8
7
be specified by the `sendemail.smtpServer` configuration
9
8
- option; the built-in default is to search for `sendmail` in
10
9
- `/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
10
+
+ option; the built-in default is to search in $PATH if such program is
12
11
available, falling back to `localhost` otherwise.
13
12
14
13
--smtp-server-port=<port>::
15
14
diff --git a/git-send-email.perl b/git-send-email.perl
16
-
index edcc6d346..8e357aeab 100755
17
15
--- a/git-send-email.perl
18
16
+++ b/git-send-email.perl
19
-
@@ -885,8 +885,7 @@ if (defined $initial_reply_to) {
17
+
@@ -944,8 +944,7 @@ if (defined $reply_to) {
20
18
}
21
19
22
20
if (!defined $smtp_server) {
+4
-4
pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
+4
-4
pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
···
1
-
diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile
2
-
--- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200
3
-
+++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200
4
-
@@ -2319,8 +2319,7 @@
1
+
diff --git a/Makefile b/Makefile
2
+
--- a/Makefile
3
+
+++ b/Makefile
4
+
@@ -2609,8 +2609,7 @@
5
5
{ test "$$bindir/" = "$$execdir/" || \
6
6
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
7
7
$(RM) "$$execdir/$$p" && \