max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 15:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support allowSubstitutes attribute in structured attribute derivations

Browse source 
Hopefully fixes #3081 (didn't test).
This commit is contained in:
Eelco Dolstra 2019-09-03 16:02:12 +02:00
parent cec50290bf
commit e07ec8d27e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -1197,7 +1197,7 @@ void DerivationGoal::haveDerivation()
/* We are first going to try to create the invalid output paths /* We are first going to try to create the invalid output paths
through substitutes. If that doesn't work, we'll build through substitutes. If that doesn't work, we'll build
them. */ them. */
if (settings.useSubstitutes && drv->substitutesAllowed()) if (settings.useSubstitutes && parsedDrv->substitutesAllowed())
for (auto & i : invalidOutputs) for (auto & i : invalidOutputs)
addWaitee(worker.makeSubstitutionGoal(i, buildMode == bmRepair ? Repair : NoRepair)); addWaitee(worker.makeSubstitutionGoal(i, buildMode == bmRepair ? Repair : NoRepair));

6
src/libstore/derivations.cc
View file

@ -36,12 +36,6 @@ Path BasicDerivation::findOutput(const string & id) const
} }
bool BasicDerivation::substitutesAllowed() const
{
return get(env, "allowSubstitutes", "1") == "1";
}
bool BasicDerivation::isBuiltin() const bool BasicDerivation::isBuiltin() const
{ {
return string(builder, 0, 8) == "builtin:"; return string(builder, 0, 8) == "builtin:";

2
src/libstore/derivations.hh
View file

@ -56,8 +56,6 @@ struct BasicDerivation
the given derivation. */ the given derivation. */
Path findOutput(const string & id) const; Path findOutput(const string & id) const;
bool substitutesAllowed() const;
bool isBuiltin() const; bool isBuiltin() const;
/* Return true iff this is a fixed-output derivation. */ /* Return true iff this is a fixed-output derivation. */

4
src/libstore/misc.cc
View file

@ -1,4 +1,5 @@
#include "derivations.hh" #include "derivations.hh"
#include "parsed-derivations.hh"
#include "globals.hh" #include "globals.hh"
#include "local-store.hh" #include "local-store.hh"
#include "store-api.hh" #include "store-api.hh"
@ -189,6 +190,7 @@ void Store::queryMissing(const PathSet & targets,
} }
Derivation drv = derivationFromPath(i2.first); Derivation drv = derivationFromPath(i2.first);
ParsedDerivation parsedDrv(i2.first, drv);
PathSet invalid; PathSet invalid;
for (auto & j : drv.outputs) for (auto & j : drv.outputs)
@ -197,7 +199,7 @@ void Store::queryMissing(const PathSet & targets,
invalid.insert(j.second.path); invalid.insert(j.second.path);
if (invalid.empty()) return; if (invalid.empty()) return;
if (settings.useSubstitutes && drv.substitutesAllowed()) { if (settings.useSubstitutes && parsedDrv.substitutesAllowed()) {
auto drvState = make_ref<Sync<DrvState>>(DrvState(invalid.size())); auto drvState = make_ref<Sync<DrvState>>(DrvState(invalid.size()));
for (auto & output : invalid) for (auto & output : invalid)
pool.enqueue(std::bind(checkOutput, i2.first, make_ref<Derivation>(drv), output, drvState)); pool.enqueue(std::bind(checkOutput, i2.first, make_ref<Derivation>(drv), output, drvState));

5
src/libstore/parsed-derivations.cc
View file

@ -108,4 +108,9 @@ bool ParsedDerivation::willBuildLocally() const
return getBoolAttr("preferLocalBuild") && canBuildLocally(); return getBoolAttr("preferLocalBuild") && canBuildLocally();
} }
bool ParsedDerivation::substitutesAllowed() const
{
return getBoolAttr("allowSubstitutes", true);
}
} }

2
src/libstore/parsed-derivations.hh
View file

@ -30,6 +30,8 @@ public:
bool canBuildLocally() const; bool canBuildLocally() const;
bool willBuildLocally() const; bool willBuildLocally() const;
bool substitutesAllowed() const;
}; };
} }