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

git: 2.50.1 -> 2.51.0 (#434809)

Browse Source
This commit is contained in:
Philip Taron
2025-08-22 09:27:14 -07:00
committed by GitHub
parent a53b47202e 8da1841bfe
commit 0b462ed4f8
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git/default.nix
+2 -8
View File
@@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.50.1";
version = "2.51.0";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [
CGI
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
}.tar.xz"
else
"https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
hash = "sha256-fj5sNt7L2PHu3RTULbZnS+A2ccIgSGS++ipBdWxcj8Q=";
hash = "sha256-YKfCJRzC5YjVzYe65WcmBhfG3gwi3KnNv8TH0riZC2I=";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -301,12 +301,6 @@ stdenv.mkDerivation (finalAttrs: {
cp -a contrib $out/share/git/
mkdir -p $out/share/bash-completion/completions
ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/
# only readme, developed in another repo
rm -r contrib/hooks/multimail
mkdir -p $out/share/git-core/contrib
cp -a contrib/hooks/ $out/share/git-core/contrib/
substituteInPlace $out/share/git-core/contrib/hooks/pre-auto-gc-battery \
--replace ' grep' ' ${gnugrep}/bin/grep' \
# grep is a runtime dependency, need to patch so that it's found
substituteInPlace $out/libexec/git-core/git-sh-setup \
pkgs/applications/version-management/git/git-send-email-honor-PATH.patch
+10 -14
View File
@@ -1,29 +1,25 @@
diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc
index 7f223db42d..7e46a07d31 100644
index 5d13a856a7..5c9978c1e4 100644
--- a/Documentation/git-send-email.adoc
+++ b/Documentation/git-send-email.adoc
@@ -177,7 +177,7 @@ Sending
@@ -190,7 +190,7 @@ Sending
The command will be executed in the shell if necessary. Default
is the value of `sendemail.sendmailCmd`. If unspecified, and if
--smtp-server is also unspecified, git-send-email will search
- for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH.
+ for `sendmail` in $PATH.
`--smtp-server` is also unspecified, `git send-email` will search
- for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH`.
+ for `sendmail` in `$PATH`.
--smtp-encryption=<encryption>::
Specify in what way encrypting begins for the SMTP connection.
@@ -233,9 +233,9 @@ a password is obtained using 'git-credential'.
--smtp-server=<host>::
@@ -247,7 +247,7 @@ a password is obtained using linkgit:git-credential[1].
If set, specifies the outgoing SMTP server to use (e.g.
`smtp.example.com` or a raw IP address). If unspecified, and if
- `--sendmail-cmd` is also unspecified, the default is to search
- for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a
- program is available, falling back to `localhost` otherwise.
+ `--sendmail-cmd` is also unspecified, the default is to search for
+ `sendmail` in $PATH if such a program is available, falling back to
+ `localhost` otherwise.
`--sendmail-cmd` is also unspecified, the default is to search
- for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH` if such a
+ for `sendmail` in `$PATH` if such a
program is available, falling back to `localhost` otherwise.
+
For backward compatibility, this option can also specify a full pathname
of a sendmail-like program instead; the program must support the `-i`
diff --git a/git-send-email.perl b/git-send-email.perl
index 798d59b84f..69c9cc2a7d 100755
--- a/git-send-email.perl