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

git: 2.54.0 -> 2.55.0

Browse Source 
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
This commit is contained in:
Adam Dinwoodie
2026-07-11 15:27:56 +01:00
parent 89cdf1a803
commit 7d44dc49ab
2 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch
-15
View File
@@ -1,15 +0,0 @@
diff -ur a/Makefile b/Makefile
--- a/Makefile 2026-02-14 15:58:16.624434564 -0500
+++ b/Makefile 2026-02-14 15:59:25.701016105 -0500
@@ -4059,9 +4059,9 @@
contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT)
$(AR) $(ARFLAGS) $@ $^
-contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) GIT-LDFLAGS
+contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) $(RUST_LIB) GIT-LDFLAGS
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
- $(filter %.o,$^) $(LIB_FILE) $(EXTLIBS) -framework Security -framework CoreFoundation
+ $(filter %.o,$^) $(LIB_FILE) $(RUST_LIB) $(EXTLIBS) -framework Security -framework CoreFoundation
contrib/credential/osxkeychain/git-credential-osxkeychain.o: contrib/credential/osxkeychain/git-credential-osxkeychain.c GIT-CFLAGS
$(QUIET_LINK)$(CC) -o $@ -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
pkgs/by-name/gi/git/package.nix
+22 -14
View File
@@ -63,7 +63,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.54.0";
version = "2.55.0";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [
CGI
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
}.tar.xz"
else
"https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
hash = "sha256-9okWI2TBDeee+Jqo2/SHMesFfjTtu9IKylEM4BVGgaM=";
hash = "sha256-RX/bBNyHKOAH1GiGleaRLm9oByeSDypAvxHqzBdQU1c=";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -133,17 +133,6 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://lore.kernel.org/git/20260504101429.340123-1-joerg@thalheim.io/raw";
hash = "sha256-44EPfEJ39LjPWjqjFb52EKNaJGzYxZzJaJOis8QnazU=";
})
# Address test failure (new in 2.52.0) caused by `git-gui--askyesno` being
# installed by `make install`.
(fetchurl {
name = "expect-gui--askyesno-failure-in-t1517.patch";
url = "https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/raw";
hash = "sha256-vvhbvg74OIMzfksHiErSnjOZ+W0M/T9J8GOQ4E4wKbU=";
})
]
++ lib.optionals rustSupport [
# The above patch doesn’t work with Rust support enabled.
./osxkeychain-link-rust_lib.patch
]
++ lib.optionals withSsh [
# Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of
@@ -272,7 +261,7 @@ stdenv.mkDerivation (finalAttrs: {
# 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 "WITH_RUST=YesPlease";
++ lib.optional (!rustSupport) "NO_RUST=YesPlease";
disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
stdenv.shellPackage
@@ -493,6 +482,13 @@ stdenv.mkDerivation (finalAttrs: {
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 (
@@ -553,6 +549,18 @@ stdenv.mkDerivation (finalAttrs: {
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