Merge pull request #12335 from obsidiansystems/fix-12295

roberth · web-flow · commit 06123f628423 · 2025-01-22T23:13:02.000+01:00
Fix #12295
diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
@@ -2565,7 +2565,7 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs()
                 case FileIngestionMethod::Git: {
                     return git::dumpHash(
                         outputHash.hashAlgo,
-                        {getFSSourceAccessor(), CanonPath(tmpDir + "/tmp")}).hash;
+                        {getFSSourceAccessor(), CanonPath(actualPath)}).hash;
                 }
                 }
                 assert(false);
diff --git a/tests/functional/fixed.nix b/tests/functional/fixed.nix
@@ -66,4 +66,7 @@ rec {
 
   # Can use "nar" instead of "recursive" now.
   nar-not-recursive = f2 "foo" ./fixed.builder2.sh "nar" "md5" "3670af73070fa14077ad74e0f5ea4e42";
+
+  # Experimental feature
+  git = f2 "foo" ./fixed.builder2.sh "git" "sha1" "cd44baf36915d5dec8374232ea7e2057f3b4494e";
 }
diff --git a/tests/functional/git-hashing/fixed.sh b/tests/functional/git-hashing/fixed.sh
@@ -0,0 +1,6 @@
+source common.sh
+
+# Store layer needs bugfix
+requireDaemonNewerThan "2.27pre20250122"
+
+nix-build ../fixed.nix -A git --no-out-link
diff --git a/tests/functional/git-hashing/meson.build b/tests/functional/git-hashing/meson.build
@@ -3,6 +3,7 @@ suites += {
   'deps': [],
   'tests': [
     'simple.sh',
+    'fixed.sh',
   ],
   'workdir': meson.current_source_dir(),
 }

Original file line number	Diff line number	Diff line change
`@@ -2565,7 +2565,7 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs()`
`2565`	`2565`	`case FileIngestionMethod::Git: {`
`2566`	`2566`	`return git::dumpHash(`
`2567`	`2567`	`outputHash.hashAlgo,`
`2568`		`- {getFSSourceAccessor(), CanonPath(tmpDir + "/tmp")}).hash;`
	`2568`	`+ {getFSSourceAccessor(), CanonPath(actualPath)}).hash;`
`2569`	`2569`	`}`
`2570`	`2570`	`}`
`2571`	`2571`	`assert(false);`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,7 @@ rec {`
`66`	`66`
`67`	`67`	`# Can use "nar" instead of "recursive" now.`
`68`	`68`	`nar-not-recursive = f2 "foo" ./fixed.builder2.sh "nar" "md5" "3670af73070fa14077ad74e0f5ea4e42";`
	`69`	`+`
	`70`	`+ # Experimental feature`
	`71`	`+ git = f2 "foo" ./fixed.builder2.sh "git" "sha1" "cd44baf36915d5dec8374232ea7e2057f3b4494e";`
`69`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ suites += {`
`3`	`3`	`'deps': [],`
`4`	`4`	`'tests': [`
`5`	`5`	`'simple.sh',`
	`6`	`+ 'fixed.sh',`
`6`	`7`	`],`
`7`	`8`	`'workdir': meson.current_source_dir(),`
`8`	`9`	`}`