Files
Adam Dinwoodie 7d44dc49ab git: 2.54.0 -> 2.55.0
Changelog: https://github.com/git/git/blob/v2.55.0/Documentation/RelNotes/2.55.0.adoc

Packaging changes:

- disable the t1517 test, since it's clearly fragile when run against an
  installed Git package
- change Rust argument handling to match the upstream project's switch
  from Rust being opt-in to opt-out
- explicitly set `debug` to an empty string in the installCheck flags,
  to avoid the test suite printing debug output and triggering new
  failures in the test harness
- remove an osx/rust patch that has been fixed upstream
2026-07-11 15:27:56 +01:00

665 lines
22 KiB
Nix

{
fetchurl,
lib,
stdenv,
buildPackages,
curl,
openssl,
zlib-ng,
expat,
perlPackages,
python3,
gettext,
gnugrep,
gnused,
gawk,
coreutils, # needed at runtime by git-filter-branch etc
openssh,
pcre2,
bash,
asciidoc,
texinfo,
xmlto,
docbook2x,
docbook_xsl,
docbook_xml_dtd_45,
libxslt,
tcl,
tk,
makeWrapper,
libiconv,
libiconvReal,
svnSupport ? false,
subversionClient,
perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform,
nlsSupport ? true,
osxkeychainSupport ? stdenv.hostPlatform.isDarwin,
guiSupport ? false,
# Disable the manual since libxslt doesn't seem to parse the files correctly.
withManual ? !stdenv.hostPlatform.useLLVM,
pythonSupport ? true,
withpcre2 ? true,
sendEmailSupport ? perlSupport,
nixosTests,
withLibsecret ? false,
pkg-config,
glib,
libsecret,
gzip, # needed at runtime by gitweb.cgi
withSsh ? false,
sysctl,
deterministic-host-uname, # trick Makefile into targeting the host platform when cross-compiling
doInstallCheck ? !stdenv.hostPlatform.isDarwin, # extremely slow on darwin
tests,
testers,
rustSupport ? lib.meta.availableOn stdenv.hostPlatform rustc,
cargo,
rustc,
nix-update-script,
}:
assert osxkeychainSupport -> stdenv.hostPlatform.isDarwin;
assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.55.0";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [
CGI
HTMLParser
CGIFast
FCGI
FCGIProcManager
HTMLTagCloud
];
perlLibs = with perlPackages; [
LWP
URI
TermReadKey
];
smtpPerlLibs = with perlPackages; [
libnet
NetSMTPSSL
IOSocketSSL
NetSSLeay
AuthenSASL
DigestHMAC
];
in
stdenv.mkDerivation (finalAttrs: {
pname =
"git"
+ lib.optionalString svnSupport "-with-svn"
+ lib.optionalString (
!svnSupport && !guiSupport && !sendEmailSupport && !withManual && !pythonSupport && !withpcre2
) "-minimal";
inherit version;
src = fetchurl {
url =
if lib.strings.hasInfix "-rc" version then
"https://www.kernel.org/pub/software/scm/git/testing/git-${
builtins.replaceStrings [ "-" ] [ "." ] version
}.tar.xz"
else
"https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
hash = "sha256-RX/bBNyHKOAH1GiGleaRLm9oByeSDypAvxHqzBdQU1c=";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
separateDebugInfo = true;
__structuredAttrs = true;
enableParallelBuilding = true;
enableParallelInstalling = true;
patches = [
# 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 node names).
./docbook2texi.patch
# Fix references to gettext.sh at runtime: hard-code it to
# ${pkgs.gettext}/bin/gettext.sh instead of assuming gettext.sh is in $PATH
./git-sh-i18n.patch
# Do not search for sendmail in /usr, only in $PATH
./git-send-email-honor-PATH.patch
# The 'total N' header from ls -l is unstable on ZFS and similar
# filesystems, causing spurious failures.
# https://github.com/NixOS/nixpkgs/issues/498789
(fetchurl {
name = "t7703-ignore-ls-total.patch";
url = "https://lore.kernel.org/git/20260504101429.340123-1-joerg@thalheim.io/raw";
hash = "sha256-44EPfEJ39LjPWjqjFb52EKNaJGzYxZzJaJOis8QnazU=";
})
]
++ lib.optionals withSsh [
# Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of
# searching in $PATH
./ssh-path.patch
];
postPatch = ''
# Fix references to gettext introduced by ./git-sh-i18n.patch
substituteInPlace git-sh-i18n.sh \
--subst-var-by gettext ${gettext}
substituteInPlace contrib/credential/libsecret/Makefile \
--replace-fail 'pkg-config' "$PKG_CONFIG"
''
+ lib.optionalString finalAttrs.doInstallCheck ''
# ensure we are using the correct shell when executing the test scripts
patchShebangs t/*.sh
''
+ lib.optionalString withSsh ''
for x in connect.c git-gui/lib/remote_add.tcl ; do
substituteInPlace "$x" \
--subst-var-by ssh "${openssh}/bin/ssh"
done
''
+ lib.optionalString (rustSupport && (stdenv.buildPlatform != stdenv.hostPlatform)) ''
substituteInPlace Makefile \
--replace-fail "RUST_TARGET_DIR = target/" \
"RUST_TARGET_DIR = target/${stdenv.hostPlatform.rust.cargoShortTarget}/"
'';
nativeBuildInputs = [
deterministic-host-uname
gettext
perlPackages.perl
makeWrapper
pkg-config
]
++ lib.optionals withManual [
asciidoc
texinfo
xmlto
docbook2x
docbook_xsl
docbook_xml_dtd_45
libxslt
]
++ lib.optionals rustSupport [
cargo
rustc
];
buildInputs = [
curl
openssl
zlib-ng
expat
(if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv)
bash
]
++ lib.optionals perlSupport [ perlPackages.perl ]
++ lib.optionals guiSupport [
tcl
tk
]
++ lib.optionals withpcre2 [ pcre2 ]
++ lib.optionals withLibsecret [
glib
libsecret
];
# This is required for building the rust build.rs script when cross compiling
depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
buildPackages.stdenv.cc
];
env = {
# required to support pthread_cancel()
NIX_LDFLAGS =
lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
+ lib.optionalString (stdenv.hostPlatform.isFreeBSD) "-lthr";
}
// lib.attrsets.optionalAttrs (rustSupport && (stdenv.buildPlatform != stdenv.hostPlatform)) {
# Rust cross-compilation
CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
};
configureFlags = [
"ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config"
]
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"ac_cv_fread_reads_directories=yes"
"ac_cv_snprintf_returns_bogus=no"
"ac_cv_iconv_omits_bom=no"
];
preBuild = ''
makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') )
'';
makeFlags = [
"prefix=\${out}"
"ZLIB_NG=1"
]
# Git does not allow setting a shell separately for building and run-time.
# Therefore lets leave it at the default /bin/sh when cross-compiling
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}"
++ (if perlSupport then [ "PERL_PATH=${perlPackages.perl}/bin/perl" ] else [ "NO_PERL=1" ])
++ (if pythonSupport then [ "PYTHON_PATH=${python3}/bin/python" ] else [ "NO_PYTHON=1" ])
++ lib.optionals stdenv.hostPlatform.isSunOS [
"INSTALL=install"
"NO_INET_NTOP="
"NO_INET_PTON="
]
++ (if stdenv.hostPlatform.isDarwin then [ "NO_APPLE_COMMON_CRYPTO=1" ] else [ "sysconfdir=/etc" ])
++ lib.optionals stdenv.hostPlatform.isMusl [
"NO_SYS_POLL_H=1"
"NO_GETTEXT=YesPlease"
]
++ lib.optional withpcre2 "USE_LIBPCRE2=1"
++ lib.optional (!nlsSupport) "NO_GETTEXT=1"
# git-gui refuses to start with the version of tk distributed with
# macOS Catalina. We can prevent git from building the .app bundle
# by specifying an invalid tk framework. The postInstall step will
# then ensure that git-gui uses tcl/tk from nixpkgs, which is an
# acceptable version.
#
# See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent"
# Starting with future Git version 3.0.0, rust will be mandatory. For now, it's optional.
++ lib.optional (!rustSupport) "NO_RUST=YesPlease";
disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
stdenv.shellPackage
];
postBuild = ''
# Set up the flags array for make in the same way as for the main build
# phase from stdenv.
local flagsArray=(
''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}}
SHELL="$SHELL"
)
concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
echoCmd 'build flags' "''${flagsArray[@]}"
''
+ lib.optionalString withManual ''
# Need to build the main Git documentation before building the
# contrib/subtree documentation, as the latter depends on the
# asciidoc.conf file created by the former.
make -C Documentation PERL_PATH=${lib.getExe buildPackages.perlPackages.perl} "''${flagsArray[@]}"
''
+ ''
make -C contrib/subtree "''${flagsArray[@]}" all ${lib.optionalString withManual "doc"}
''
+ lib.optionalString perlSupport ''
make -C contrib/diff-highlight "''${flagsArray[@]}"
''
+ lib.optionalString osxkeychainSupport ''
make -C contrib/credential/osxkeychain COMPUTE_HEADER_DEPENDENCIES=no "''${flagsArray[@]}"
''
+ lib.optionalString withLibsecret ''
make -C contrib/credential/libsecret "''${flagsArray[@]}"
''
+ ''
unset flagsArray
'';
## Install
# WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead.
# We need many of these files during the installCheckPhase.
installFlags = [ "NO_INSTALL_HARDLINKS=1" ];
preInstall =
lib.optionalString osxkeychainSupport ''
mkdir -p $out/libexec/git-core
ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core/
# ideally unneeded, but added for backwards compatibility
mkdir -p $out/bin
ln -s $out/libexec/git-core/git-credential-osxkeychain $out/bin/
rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o
''
+ lib.optionalString withLibsecret ''
mkdir -p $out/libexec/git-core
ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/libexec/git-core/
# ideally unneeded, but added for backwards compatibility
mkdir -p $out/bin
ln -s $out/libexec/git-core/git-credential-libsecret $out/bin/
rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o
'';
postInstall = ''
# Set up the flags array for make in the same way as for the main install
# phase from stdenv.
local flagsArray=(
''${enableParallelInstalling:+-j''${NIX_BUILD_CORES}}
SHELL="$SHELL"
)
concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray
echoCmd 'install flags' "''${flagsArray[@]}"
# Install git-subtree.
make -C contrib/subtree "''${flagsArray[@]}" install ${lib.optionalString withManual "install-doc"}
rm -rf contrib/subtree
# Install contrib stuff.
mkdir -p $out/share/git
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/
# grep is a runtime dependency, need to patch so that it's found
substituteInPlace $out/libexec/git-core/git-sh-setup \
--replace ' grep' ' ${gnugrep}/bin/grep' \
--replace ' egrep' ' ${gnugrep}/bin/egrep'
# Fix references to the perl, sed, awk and various coreutil binaries used by
# shell scripts that git calls (e.g. filter-branch)
SCRIPT="$(cat <<'EOS'
BEGIN{
@a=(
'${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
'${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
'${coreutils}/bin/wc', '${coreutils}/bin/tr'
${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"}
);
}
foreach $c (@a) {
$n=(split("/", $c))[-1];
s|(?<=[^#][^/.-])\b''${n}(?=\s)|''${c}|g
}
EOS
)"
perl -0777 -i -pe "$SCRIPT" \
$out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse}
# Also put git-http-backend into $PATH, so that we can use smart
# HTTP(s) transports for pushing
ln -s $out/libexec/git-core/git-http-backend${stdenv.hostPlatform.extensions.executable} $out/bin/git-http-backend
ln -s $out/share/git/contrib/git-jump/git-jump $out/bin/git-jump
''
+ lib.optionalString perlSupport ''
# wrap perl commands
makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/libexec/git-core/git-credential-netrc \
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
# ideally unneeded, but added for backwards compatibility
ln -s $out/libexec/git-core/git-credential-netrc $out/bin/
wrapProgram $out/libexec/git-core/git-cvsimport \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
wrapProgram $out/libexec/git-core/git-archimport \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
wrapProgram $out/libexec/git-core/git-instaweb \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
wrapProgram $out/libexec/git-core/git-cvsexportcommit \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
# gzip (and optionally bzip2, xz, zip) are runtime dependencies for
# gitweb.cgi, need to patch so that it's found
sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
$out/share/gitweb/gitweb.cgi
# Give access to CGI.pm and friends (was removed from perl core in 5.22)
for p in ${lib.concatStringsSep " " gitwebPerlLibs}; do
sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \
"$out/share/gitweb/gitweb.cgi"
done
''
+ (
if svnSupport then
''
# wrap git-svn
wrapProgram $out/libexec/git-core/git-svn \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${
perlPackages.makePerlPath (perlLibs ++ [ svn.out ])
}" \
--prefix PATH : "${svn.out}/bin"
''
else
''
rm $out/libexec/git-core/git-svn
''
)
+ (
if sendEmailSupport then
''
# wrap git-send-email
wrapProgram $out/libexec/git-core/git-send-email \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath smtpPerlLibs}"
''
else
''
rm $out/libexec/git-core/git-send-email
''
)
+ lib.optionalString withManual ''
# Install man pages
make "''${flagsArray[@]}" install install-html \
-C Documentation
''
+ (
if guiSupport then
''
# Wrap Tcl/Tk programs
for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
-e "s|exec wish|exec '${tk}/bin/wish'|g" \
"$out/$prog"
done
ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk
''
else
''
for prog in bin/gitk libexec/git-core/git-gui; do
rm "$out/$prog"
done
''
)
+ lib.optionalString osxkeychainSupport ''
# enable git-credential-osxkeychain on darwin if desired (default)
mkdir -p $out/etc
cat > $out/etc/gitconfig << EOF
[credential]
helper = osxkeychain
EOF
''
+ ''
unset flagsArray
'';
## InstallCheck
doCheck = false;
inherit doInstallCheck;
installCheckTarget = "test";
# see also installCheckFlagsArray
installCheckFlags = [
"DEFAULT_TEST_TARGET=prove"
"PERL_PATH=${buildPackages.perl}/bin/perl"
# Without setting debug explicitly, the test suite inherits the value of
# debug from the environment, which -- if separateDebugInfo is true -- will
# be the debug output path. The test suite then prints out extra debug
# info, as if `--debug` were passed on the command line, which causes test
# failures because that info can't be interpreted by the test harness.
"debug="
];
nativeInstallCheckInputs = lib.optional (
stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD
) sysctl;
preInstallCheck = ''
# Some tests break with high concurrency
# https://github.com/NixOS/nixpkgs/pull/403237
if ((NIX_BUILD_CORES > 32)); then
NIX_BUILD_CORES=32
fi
installCheckFlagsArray+=(
GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"
GIT_TEST_INSTALLED=$out/bin
${lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"}
)
function disable_test {
local test=$1 pattern=$2
if [ $# -eq 1 ]; then
mv t/{,skip-}$test.sh || true
else
sed -i t/$test.sh \
-e "/^\s*test_expect_.*$pattern/,/^\s*' *\$/{s/^/: #/}"
fi
}
# Shared permissions are forbidden in sandbox builds:
substituteInPlace t/test-lib.sh \
--replace "test_set_prereq POSIXPERM" ""
# TODO: Investigate while these still fail (without POSIXPERM):
# Tested to fail: 2.46.0
disable_test t0001-init 'shared overrides system'
# Tested to fail: 2.46.0
disable_test t0001-init 'init honors global core.sharedRepository'
# Tested to fail: 2.46.0
disable_test t1301-shared-repo
# /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found
disable_test t9902-completion
''
+ lib.optionalString (!sendEmailSupport) ''
# Disable sendmail tests
disable_test t9001-send-email
''
+ ''
# Flaky tests:
disable_test t0027-auto-crlf
disable_test t1451-fsck-buffer
disable_test t5319-multi-pack-index
disable_test t6421-merge-partial-clone
disable_test t7504-commit-msg-hook
disable_test t5515-fetch-merge-logic
disable_test t4104-apply-boundary
disable_test t7002-mv-sparse-checkout
disable_test t4122-apply-symlink-inside
disable_test t7513-interpret-trailers
disable_test t2200-add-update
# Fails when run with GIT_TEST_INSTALLED, that is, when we're testing an
# installed package rather than the build output prior to installation.
# This test is fragile when testing an installed package even in Nix's
# otherwise clean build environment, upstream haven't been keen on patching
# individual failures when they crop up, and nobody has yet managed to
# rewrite the test to be less fragile.
#
# See in particular the below messages and discussions around them:
# https://lore.kernel.org/git/xmqqect7fhnp.fsf@gitster.g/
# https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/
disable_test t1517-outside-repo
# Fails reproducibly on ZFS on Linux with formD normalization
disable_test t0021-conversion
disable_test t3910-mac-os-precompose
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
# XXX: Some tests added in 2.24.0 fail.
# Please try to re-enable on the next release.
disable_test t7816-grep-binary-pattern
# fail (as of 2.33.0)
#===( 18623;1208 8/? 224/? 2/? )= =fatal: Not a valid object name refs/tags/signed-empty
disable_test t6300-for-each-ref
# not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin)
disable_test t5003-archive-zip
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
disable_test t7527-builtin-fsmonitor
''
+
lib.optionalString (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.system == "x86_64-linux")
''
# https://github.com/NixOS/nixpkgs/pull/394957
# > t2082-parallel-checkout-attributes.sh (Wstat: 256 (exited 1) Tests: 5 Failed: 1)
disable_test t2082-parallel-checkout-attributes
''
+ lib.optionalString stdenv.hostPlatform.isMusl ''
# Test fails (as of 2.17.0, musl 1.1.19)
disable_test t3900-i18n-commit
# Fails largely due to assumptions about BOM
# Tested to fail: 2.18.0
disable_test t0028-working-tree-encoding
''
+ lib.optionalString stdenv.hostPlatform.isFreeBSD ''
# Time zones are not available in the build sandbox.
# This can be fixed if/when we decide on how the hardcoded libc paths should look
disable_test t0006-date
# Kernel bug (?) related to confusion over whether ulimit -n should set max fd or num files
disable_test t5324-split-commit-graph
# known breakage vanished?
disable_test t7815-grep-binary
'';
stripDebugList = [
"lib"
"libexec"
"bin"
"share/git/contrib/credential"
];
passthru = {
shellPath = "/bin/git-shell";
tests = {
withInstallCheck = finalAttrs.finalPackage.overrideAttrs (_: {
doInstallCheck = true;
});
buildbot-integration = nixosTests.buildbot;
}
// lib.optionalAttrs svnSupport {
git-svn-version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "git svn --version";
version = "git-svn version ${version}";
};
}
// tests.fetchgit;
# We get the source from the release packages, since that contains a few
# extra files that make the build easier without already having a Git
# installation. We get the version from GitHub, however, as that provides
# a nicer API for checking what the latest version is.
updateScript = nix-update-script {
extraArgs = [
"--url"
"https://github.com/git/git"
];
};
};
meta = {
homepage = "https://git-scm.com/";
description = "Distributed version control system";
license = lib.licenses.gpl2;
changelog = "https://github.com/git/git/blob/v${version}/Documentation/RelNotes/${version}.adoc";
longDescription = ''
Git, a popular distributed version control system designed to
handle very large projects with speed and efficiency.
'';
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [
wmertens
kashw2
me-and
philiptaron
zivarah
];
teams = [ lib.teams.security-review ];
mainProgram = "git";
identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "git-scm" finalAttrs.version;
};
})