Correctly handle “real” input-addressed derivations

thufschmitt · thufschmitt · commit d20639a322e3 · 2021-07-29T07:17:57.000+02:00
It’s possible that their inputs don’t have a properly registered
`realisation` (coming from an older Nix), so don’t assume that
diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
@@ -259,13 +259,10 @@ void State::buildRemote(ref<Store> destStore,
             basicDrv = BasicDerivation(*step->drv);
             for (auto & input : step->drv->inputDrvs) {
               auto drv2 = localStore->readDerivation(input.first);
-              auto hashes = staticOutputHashes(*localStore, drv2);
+              auto drv2Outputs = drv2.outputsAndOptPaths(*localStore);
               for (auto & name : input.second) {
-                if (settings.isExperimentalFeatureEnabled("ca-derivations")) {
-                  auto inputRealisation = localStore->queryRealisation(DrvOutput{hashes.at(name), name});
-                  assert(inputRealisation);
-                  basicDrv.inputSrcs.insert(inputRealisation->outPath);
-                }
+                auto inputPath = drv2Outputs.at(name);
+                basicDrv.inputSrcs.insert(*inputPath.second);
               }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -259,13 +259,10 @@ void State::buildRemote(ref<Store> destStore,`
`259`	`259`	`basicDrv = BasicDerivation(*step->drv);`
`260`	`260`	`for (auto & input : step->drv->inputDrvs) {`
`261`	`261`	`auto drv2 = localStore->readDerivation(input.first);`
`262`		`- auto hashes = staticOutputHashes(*localStore, drv2);`
	`262`	`+ auto drv2Outputs = drv2.outputsAndOptPaths(*localStore);`
`263`	`263`	`for (auto & name : input.second) {`
`264`		`- if (settings.isExperimentalFeatureEnabled("ca-derivations")) {`
`265`		`- auto inputRealisation = localStore->queryRealisation(DrvOutput{hashes.at(name), name});`
`266`		`- assert(inputRealisation);`
`267`		`- basicDrv.inputSrcs.insert(inputRealisation->outPath);`
`268`		`- }`
	`264`	`+ auto inputPath = drv2Outputs.at(name);`
	`265`	`+ basicDrv.inputSrcs.insert(*inputPath.second);`
`269`	`266`	`}`
`270`	`267`	`}`
`271`	`268`	`}`