-
- Downloads
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.
Showing
- config-daemon.ac 0 additions, 2 deletionsconfig-daemon.ac
- nix/libstore/build.cc 19 additions, 33 deletionsnix/libstore/build.cc
- nix/libstore/globals.hh 0 additions, 5 deletionsnix/libstore/globals.hh
- nix/libstore/local-store.cc 54 additions, 43 deletionsnix/libstore/local-store.cc
- nix/libstore/local-store.hh 5 additions, 7 deletionsnix/libstore/local-store.hh
- nix/local.mk 0 additions, 3 deletionsnix/local.mk
- nix/nix-daemon/guix-daemon.cc 1 addition, 10 deletionsnix/nix-daemon/guix-daemon.cc
- nix/nix-daemon/nix-daemon.cc 6 additions, 2 deletionsnix/nix-daemon/nix-daemon.cc
- nix/scripts/substitute.in 0 additions, 11 deletionsnix/scripts/substitute.in
Loading
Please register or sign in to comment