diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-12-08 22:50:18 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-12-08 23:58:12 +0100 |
| commit | b23b4d394a39b60188ed74ecdf1027bc7dd5b9b3 (patch) | |
| tree | 1be78e8e089d88a4c553a5d328a4a6ebc58338ed /nix/nix-daemon | |
| parent | 7fbee931a5565a009e23f785c5874a55a905626f (diff) | |
| download | patches-b23b4d394a39b60188ed74ecdf1027bc7dd5b9b3.tar patches-b23b4d394a39b60188ed74ecdf1027bc7dd5b9b3.tar.gz | |
daemon: Allow builds to be repeated.
This makes it easy to detect non-deterministic builds.
* nix/libstore/build.cc (DerivationGoal): Remove 'InodesSeen'; add
'curRound', 'nrRound', and 'prevInfos'.
(DerivationGoal::inputsRealised): Initialize 'nrRound'.
(NotDeterministic): New error type.
(DerivationGoal::buildDone): Check whether we need to repeat.
(DerivationGoal::startBuilder): Adjust message.
(DerivationGoal::registerOutputs): Check whether we get the same result.
* nix/libstore/globals.cc (Settings::get(const string & name, int def)):
New method.
* nix/libstore/globals.hh (Settings): Add it.
* nix/libstore/store-api.hh (ValidPathInfo): Add operator ==.
* nix/nix-daemon/nix-daemon.cc (performOp): Allow "build-repeat" for
"untrusted" users.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'nix/nix-daemon')
| -rw-r--r-- | nix/nix-daemon/nix-daemon.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc index c1e697bcac..35c284f7e1 100644 --- a/nix/nix-daemon/nix-daemon.cc +++ b/nix/nix-daemon/nix-daemon.cc @@ -565,7 +565,7 @@ static void performOp(bool trusted, unsigned int clientVersion, for (unsigned int i = 0; i < n; i++) { string name = readString(from); string value = readString(from); - if (name == "build-timeout" || name == "use-ssh-substituter") + if (name == "build-timeout" || name == "build-repeat" || name == "use-ssh-substituter") settings.set(name, value); else settings.set(trusted ? name : "untrusted-" + name, value); |