pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #134411 from primeos/git

git: 2.32.0 -> 2.33.0

authored by

Michael Weiss and committed by
GitHub e20df220 ef802e74

+22 -17
unified split
+4 -2
pkgs/applications/version-management/git-and-tools/git/default.nix
··· 25 25 assert svnSupport -> perlSupport; 26 26 27 27 let 28 - version = "2.32.0"; 28 + version = "2.33.0"; 29 29 svn = subversionClient.override { perlBindings = perlSupport; }; 30 30 31 31 gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; ··· 37 37 38 38 src = fetchurl { 39 39 url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; 40 - sha256 = "08rnm3ipjqdd2n31dw7mxl3iv9g4nxgc409krmz892a37kd43a38"; 40 + sha256 = "0kqcs8nj5h7rh3q86pw5777awq7gn77lgxk88ynjl1rfz2snlg5z"; 41 41 }; 42 42 43 43 outputs = [ "out" ] ++ lib.optional withManual "doc"; ··· 297 297 disable_test t0001-init 'shared overrides system' 298 298 disable_test t0001-init 'init honors global core.sharedRepository' 299 299 disable_test t1301-shared-repo 300 + # git-completion.bash: line 405: compgen: command not found: 301 + disable_test t9902-completion 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' 300 302 301 303 # Our patched gettext never fallbacks 302 304 disable_test t0201-gettext-fallbacks
+18 -15
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 1afe9fc858..05dd7c3a90 100644 2 + index 3db4eab4ba..39bc0e77c9 100644 3 3 --- a/Documentation/git-send-email.txt 4 4 +++ b/Documentation/git-send-email.txt 5 - @@ -215,8 +215,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>:: 5 + @@ -220,9 +220,9 @@ a password is obtained using 'git-credential'. 6 + --smtp-server=<host>:: 7 + If set, specifies the outgoing SMTP server to use (e.g. 8 + `smtp.example.com` or a raw IP address). If unspecified, and if 9 + - `--sendmail-cmd` is also unspecified, the default is to search 10 + - for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a 11 + - program is available, falling back to `localhost` otherwise. 12 + + `--sendmail-cmd` is also unspecified, the default is to search for 13 + + `sendmail` in $PATH if such a program is available, falling back to 14 + + `localhost` otherwise. 15 + + 16 + For backward compatibility, this option can also specify a full pathname 17 + of a sendmail-like program instead; the program must support the `-i` 15 18 diff --git a/git-send-email.perl b/git-send-email.perl 16 - index 8eb63b5a2f..74a61d8213 100755 19 + index e65d969d0b..508d49483d 100755 17 20 --- a/git-send-email.perl 18 21 +++ b/git-send-email.perl 19 - @@ -956,8 +956,7 @@ sub expand_one_alias { 22 + @@ -1066,8 +1066,7 @@ sub expand_one_alias { 20 23 } 21 24 22 - if (!defined $smtp_server) { 25 + if (!defined $sendmail_cmd && !defined $smtp_server) { 23 26 - my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); 24 27 - push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; 25 28 + my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH}; 26 29 foreach (@sendmail_paths) { 27 30 if (-x $_) { 28 - $smtp_server = $_; 31 + $sendmail_cmd = $_;