Merge pull request #14257 from obsidiansystems/misc-builder-tech-debt

Cleanup misc builder tech debt

Author: Ericson2314

src/libstore/build/derivation-goal.cc

@@ -100,8 +100,7 @@ Goal::Co DerivationGoal::haveDerivation(bool storeDerivation)
            them. */
         if (settings.useSubstitutes && drvOptions.substitutesAllowed()) {
             if (!checkResult)
-                waitees.insert(upcast_goal(worker.makeDrvOutputSubstitutionGoal(
-                    DrvOutput{outputHash, wantedOutput}, buildMode == bmRepair ? Repair : NoRepair)));
+                waitees.insert(upcast_goal(worker.makeDrvOutputSubstitutionGoal(DrvOutput{outputHash, wantedOutput})));
             else {
                 auto * cap = getDerivationCA(*drv);
                 waitees.insert(upcast_goal(worker.makePathSubstitutionGoal(
@@ -171,8 +170,6 @@ Goal::Co DerivationGoal::haveDerivation(bool storeDerivation)
             auto outputHashes = staticOutputHashes(worker.evalStore, *drv);
             auto resolvedHashes = staticOutputHashes(worker.store, drvResolved);
 
-            StorePathSet outputPaths;
-
             auto outputHash = get(outputHashes, wantedOutput);
             auto resolvedHash = get(resolvedHashes, wantedOutput);
             if ((!outputHash) || (!resolvedHash))
@@ -212,7 +209,6 @@ Goal::Co DerivationGoal::haveDerivation(bool storeDerivation)
                 worker.store.signRealisation(newRealisation);
                 worker.store.registerDrvOutput(newRealisation);
             }
-            outputPaths.insert(realisation.outPath);
 
             auto status = success.status;
             if (status == BuildResult::Success::AlreadyValid)

src/libstore/build/drv-output-substitution-goal.cc

@@ -8,8 +8,7 @@
 
 namespace nix {
 
-DrvOutputSubstitutionGoal::DrvOutputSubstitutionGoal(
-    const DrvOutput & id, Worker & worker, RepairFlag repair, std::optional<ContentAddress> ca)
+DrvOutputSubstitutionGoal::DrvOutputSubstitutionGoal(const DrvOutput & id, Worker & worker)
     : Goal(worker, init())
     , id(id)
 {

src/libstore/build/worker.cc

@@ -104,10 +104,9 @@ Worker::makePathSubstitutionGoal(const StorePath & path, RepairFlag repair, std:
     return initGoalIfNeeded(substitutionGoals[path], path, *this, repair, ca);
 }
 
-std::shared_ptr<DrvOutputSubstitutionGoal>
-Worker::makeDrvOutputSubstitutionGoal(const DrvOutput & id, RepairFlag repair, std::optional<ContentAddress> ca)
+std::shared_ptr<DrvOutputSubstitutionGoal> Worker::makeDrvOutputSubstitutionGoal(const DrvOutput & id)
 {
-    return initGoalIfNeeded(drvOutputSubstitutionGoals[id], id, *this, repair, ca);
+    return initGoalIfNeeded(drvOutputSubstitutionGoals[id], id, *this);
 }
 
 GoalPtr Worker::makeGoal(const DerivedPath & req, BuildMode buildMode)

src/libstore/include/nix/store/build/drv-output-substitution-goal.hh

@@ -29,14 +29,7 @@ class DrvOutputSubstitutionGoal : public Goal
     DrvOutput id;
 
 public:
-    DrvOutputSubstitutionGoal(
-        const DrvOutput & id,
-        Worker & worker,
-        RepairFlag repair = NoRepair,
-        std::optional<ContentAddress> ca = std::nullopt);
-
-    typedef void (DrvOutputSubstitutionGoal::*GoalState)();
-    GoalState state;
+    DrvOutputSubstitutionGoal(const DrvOutput & id, Worker & worker);
 
     Co init();
     Co realisationFetched(Goals waitees, std::shared_ptr<const Realisation> outputInfo, nix::ref<nix::Store> sub);

src/libstore/include/nix/store/build/worker.hh

@@ -240,8 +240,7 @@ public:
      */
     std::shared_ptr<PathSubstitutionGoal> makePathSubstitutionGoal(
         const StorePath & storePath, RepairFlag repair = NoRepair, std::optional<ContentAddress> ca = std::nullopt);
-    std::shared_ptr<DrvOutputSubstitutionGoal> makeDrvOutputSubstitutionGoal(
-        const DrvOutput & id, RepairFlag repair = NoRepair, std::optional<ContentAddress> ca = std::nullopt);
+    std::shared_ptr<DrvOutputSubstitutionGoal> makeDrvOutputSubstitutionGoal(const DrvOutput & id);
 
     /**
      * Make a goal corresponding to the `DerivedPath`.