wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Fix #12295

Browse source 
We were simply passing in the wrong path. This went uncaught because the
TODO about deduplication hasn't happened yet.
This commit is contained in:
John Ericson 2025-01-22 16:15:49 -05:00
parent 64a38992da
commit 7f7ca3810b
4 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/unix/build/local-derivation-goal.cc
View file

@ -2565,7 +2565,7 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs()
case FileIngestionMethod::Git: { case FileIngestionMethod::Git: {
return git::dumpHash( return git::dumpHash(
outputHash.hashAlgo, outputHash.hashAlgo,
{getFSSourceAccessor(), CanonPath(tmpDir + "/tmp")}).hash; {getFSSourceAccessor(), CanonPath(actualPath)}).hash;
} }
} }
assert(false); assert(false);

3
tests/functional/fixed.nix
View file

@ -66,4 +66,7 @@ rec {
# Can use "nar" instead of "recursive" now. # Can use "nar" instead of "recursive" now.
nar-not-recursive = f2 "foo" ./fixed.builder2.sh "nar" "md5" "3670af73070fa14077ad74e0f5ea4e42"; nar-not-recursive = f2 "foo" ./fixed.builder2.sh "nar" "md5" "3670af73070fa14077ad74e0f5ea4e42";
# Experimental feature
git = f2 "foo" ./fixed.builder2.sh "git" "sha1" "cd44baf36915d5dec8374232ea7e2057f3b4494e";
} }

6
tests/functional/git-hashing/fixed.sh Normal file
View file

@ -0,0 +1,6 @@
source common.sh
# Store layer needs bugfix
requireDaemonNewerThan "2.27pre20250122"
nix-build ../fixed.nix -A git --no-out-link

1
tests/functional/git-hashing/meson.build
View file

@ -3,6 +3,7 @@ suites += {
'deps': [], 'deps': [],
'tests': [ 'tests': [
'simple.sh', 'simple.sh',
'fixed.sh',
], ],
'workdir': meson.current_source_dir(), 'workdir': meson.current_source_dir(),
} }