diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-04 11:04:44 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-08 11:49:24 +0200 |
| commit | f6919ebdc6b0ce0286814cc6ab0564b1a4c67f5f (patch) | |
| tree | 6b9d4a206bc2f530756ad55935e7704fb54a6563 /nix/local.mk | |
| parent | bc69ea2d605810cc32e13ed03d5848b8dc358b61 (diff) | |
| download | guix-f6919ebdc6b0ce0286814cc6ab0564b1a4c67f5f.tar.gz | |
daemon: Run 'guix substitute' directly and assume a single substituter.
The daemon had a mechanism that allows it to handle a list of substituters and try them sequentially; this removes it. * nix/scripts/substitute.in: Remove. * nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove. * config-daemon.ac: Don't output 'nix/scripts/substitute'. * nix/libstore/build.cc (SubstitutionGoal)[subs, sub, hasSubstitute]: Remove. [tryNext]: Make private. (SubstitutionGoal::SubstitutionGoal, SubstitutionGoal::init): Remove now unneeded initializers. (SubstitutionGoal::tryNext): Adjust to assume a single substituter: call 'amDone' upfront when we couldn't find substitutes. (SubstitutionGoal::tryToRun): Adjust to run 'guix substitute' via 'settings.guixProgram'. (SubstitutionGoal::finished): Call 'amDone(ecFailed)' upon failure instead of setting 'state' to 'tryNext'. * nix/libstore/globals.hh (Settings)[substituters]: Remove. * nix/libstore/local-store.cc (LocalStore::~LocalStore): Adjust to handle a single substituter. (LocalStore::startSubstituter): Remove 'path' parameter. Adjust to invoke 'settings.guixProgram'. Don't refer to 'run.program', which no longer exists. (LocalStore::querySubstitutablePaths): Adjust for 'runningSubstituters' being a singleton instead of a list. (LocalStore::querySubstitutablePathInfos): Likewise, and remove 'substituter' parameter. * nix/libstore/local-store.hh (RunningSubstituter)[program]: Remove. (LocalStore)[runningSubstituters]: Remove. [runningSubstituter]: New field. [querySubstitutablePathInfos]: Remove 'substituter' parameter. [startSubstituter]: Remove 'substituter' parameter. * nix/nix-daemon/guix-daemon.cc (main): Remove references to 'settings.substituters'. * nix/nix-daemon/nix-daemon.cc (performOp): Ignore the user's "build-use-substitutes" value when 'settings.useSubstitutes' is false.
Diffstat (limited to 'nix/local.mk')
| -rw-r--r-- | nix/local.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/nix/local.mk b/nix/local.mk index 8e52c77bd9..18e9ba7604 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -154,9 +154,6 @@ noinst_HEADERS = \ (lambda (in) \ (write (get-string-all in) out)))))" -nodist_pkglibexec_SCRIPTS = \ - %D%/scripts/substitute - # The '.service' files for systemd. systemdservicedir = $(libdir)/systemd/system nodist_systemdservice_DATA = etc/guix-daemon.service etc/guix-publish.service |