wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 21:51:50 +02:00
Code Activity

Remove the remote-builds option

Browse source 
This is superfluous since you can now just set "builders" to empty,
e.g. "--builders ''".
This commit is contained in:
Eelco Dolstra 2017-10-24 11:00:16 +02:00
parent af241ae7d3
commit 25f32625e2
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
5 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build.cc
View file

@ -274,6 +274,10 @@ public:
uint64_t expectedNarSize = 0;
uint64_t doneNarSize = 0;
/* Whether to ask the build hook if it can build a derivation. If
it answers with "decline-permanently", we don't try again. */
bool tryBuildHook = true;
Worker(LocalStore & store);
~Worker();
@ -1622,7 +1626,7 @@ void DerivationGoal::buildDone()
HookReply DerivationGoal::tryBuildHook()
{
if (!settings.useBuildHook || !useDerivation) return rpDecline;
if (!worker.tryBuildHook || !useDerivation) return rpDecline;
if (!worker.hook)
worker.hook = std::make_unique<HookInstance>();
@ -1662,7 +1666,7 @@ HookReply DerivationGoal::tryBuildHook()
if (reply == "decline")
return rpDecline;
else if (reply == "decline-permanently") {
settings.useBuildHook = false;
worker.tryBuildHook = false;
worker.hook = 0;
return rpDecline;
}