mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'nix-upgrade-profile' of https://github.com/LnL7/nix

Browse source
This commit is contained in:
Eelco Dolstra 2018-08-30 17:10:59 +02:00
commit ddeda0b62e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/nix/upgrade-nix.cc
View file

@ -1,4 +1,5 @@
#include "command.hh" #include "command.hh"
#include "common-args.hh"
#include "store-api.hh" #include "store-api.hh"
#include "download.hh" #include "download.hh"
#include "eval.hh" #include "eval.hh"
@ -6,7 +7,7 @@
using namespace nix; using namespace nix;
struct CmdUpgradeNix : StoreCommand struct CmdUpgradeNix : MixDryRun, StoreCommand
{ {
Path profileDir; Path profileDir;
std::string storePathsUrl = "https://github.com/NixOS/nixpkgs/raw/master/nixos/modules/installer/tools/nix-fallback-paths.nix"; std::string storePathsUrl = "https://github.com/NixOS/nixpkgs/raw/master/nixos/modules/installer/tools/nix-fallback-paths.nix";
@ -68,21 +69,25 @@ struct CmdUpgradeNix : StoreCommand
{ {
Activity act(*logger, lvlInfo, actUnknown, fmt("downloading '%s'...", storePath)); Activity act(*logger, lvlInfo, actUnknown, fmt("downloading '%s'...", storePath));
store->ensurePath(storePath); if (!dryRun)
store->ensurePath(storePath);
} }
{ {
Activity act(*logger, lvlInfo, actUnknown, fmt("verifying that '%s' works...", storePath)); Activity act(*logger, lvlInfo, actUnknown, fmt("verifying that '%s' works...", storePath));
auto program = storePath + "/bin/nix-env"; if (!dryRun) {
auto s = runProgram(program, false, {"--version"}); auto program = storePath + "/bin/nix-env";
if (s.find("Nix") == std::string::npos) auto s = runProgram(program, false, {"--version"});
throw Error("could not verify that '%s' works", program); if (s.find("Nix") == std::string::npos)
throw Error("could not verify that '%s' works", program);
}
} }
{ {
Activity act(*logger, lvlInfo, actUnknown, fmt("installing '%s' into profile '%s'...", storePath, profileDir)); Activity act(*logger, lvlInfo, actUnknown, fmt("installing '%s' into profile '%s'...", storePath, profileDir));
runProgram(settings.nixBinDir + "/nix-env", false, if (!dryRun)
{"--profile", profileDir, "-i", storePath, "--no-sandbox"}); runProgram(settings.nixBinDir + "/nix-env", false,
{"--profile", profileDir, "-i", storePath, "--no-sandbox"});
} }
} }
@ -105,11 +110,18 @@ struct CmdUpgradeNix : StoreCommand
if (hasPrefix(where, "/run/current-system")) if (hasPrefix(where, "/run/current-system"))
throw Error("Nix on NixOS must be upgraded via 'nixos-rebuild'"); throw Error("Nix on NixOS must be upgraded via 'nixos-rebuild'");
Path profileDir; Path profileDir = dirOf(where);
Path userEnv;
// Resolve profile to /nix/var/nix/profiles/<name> link.
while (baseNameOf(dirOf(canonPath(profileDir))) != "profiles")
profileDir = readLink(profileDir);
printInfo("found profile '%s'", profileDir);
Path userEnv = canonPath(profileDir, true);
if (baseNameOf(where) != "bin" || if (baseNameOf(where) != "bin" ||
!hasSuffix(userEnv = canonPath(profileDir = dirOf(where), true), "user-environment")) !hasSuffix(userEnv, "user-environment"))
throw Error("directory '%s' does not appear to be part of a Nix profile", where); throw Error("directory '%s' does not appear to be part of a Nix profile", where);
if (!store->isValidPath(userEnv)) if (!store->isValidPath(userEnv))