nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Remove unused parameters to DrvOutputSubstitutionGoal

Browse source
This commit is contained in:
John Ericson 2025-10-14 18:53:03 -04:00
parent b20cebf993
commit 46357468a4
5 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/build/derivation-goal.cc
View file

@ -100,8 +100,7 @@ Goal::Co DerivationGoal::haveDerivation(bool storeDerivation)
them. */ them. */
if (settings.useSubstitutes && drvOptions.substitutesAllowed()) { if (settings.useSubstitutes && drvOptions.substitutesAllowed()) {
if (!checkResult) if (!checkResult)
waitees.insert(upcast_goal(worker.makeDrvOutputSubstitutionGoal( waitees.insert(upcast_goal(worker.makeDrvOutputSubstitutionGoal(DrvOutput{outputHash, wantedOutput})));
DrvOutput{outputHash, wantedOutput}, buildMode == bmRepair ? Repair : NoRepair)));
else { else {
auto * cap = getDerivationCA(*drv); auto * cap = getDerivationCA(*drv);
waitees.insert(upcast_goal(worker.makePathSubstitutionGoal( waitees.insert(upcast_goal(worker.makePathSubstitutionGoal(

3
src/libstore/build/drv-output-substitution-goal.cc
View file

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

5
src/libstore/build/worker.cc
View file

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

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

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

3
src/libstore/include/nix/store/build/worker.hh
View file

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