aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-08-30 17:10:28 +0200
committerEelco Dolstra <edolstra@gmail.com>2018-08-30 17:10:28 +0200
commit264e66f69699919f1040be2986b91fd6b188e9af (patch)
treef5a11f10c5c9975d50762f10c15a1871c4280af0 /src/nix
parent308689f94bf64514ee91acc8eed09e4a48b7730a (diff)
Add simple test for nix upgrade-nix
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/upgrade-nix.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc
index e23ae7923..4f4d0ebc0 100644
--- a/src/nix/upgrade-nix.cc
+++ b/src/nix/upgrade-nix.cc
@@ -9,6 +9,7 @@ using namespace nix;
struct CmdUpgradeNix : StoreCommand
{
Path profileDir;
+ std::string storePathsUrl = "https://github.com/NixOS/nixpkgs/raw/master/nixos/modules/installer/tools/nix-fallback-paths.nix";
CmdUpgradeNix()
{
@@ -18,6 +19,12 @@ struct CmdUpgradeNix : StoreCommand
.labels({"profile-dir"})
.description("the Nix profile to upgrade")
.dest(&profileDir);
+
+ mkFlag()
+ .longName("nix-store-paths-url")
+ .labels({"url"})
+ .description("URL of the file that contains the store paths of the latest Nix release")
+ .dest(&storePathsUrl);
}
std::string name() override
@@ -115,7 +122,7 @@ struct CmdUpgradeNix : StoreCommand
Path getLatestNix(ref<Store> store)
{
// FIXME: use nixos.org?
- auto req = DownloadRequest("https://github.com/NixOS/nixpkgs/raw/master/nixos/modules/installer/tools/nix-fallback-paths.nix");
+ auto req = DownloadRequest(storePathsUrl);
auto res = getDownloader()->download(req);
auto state = std::make_unique<EvalState>(Strings(), store);