maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ssh-store' of https://github.com/shlevy/nix

Browse source
This commit is contained in:
Eelco Dolstra 2016-11-09 18:57:22 +01:00
commit 4b8f1b0ec0
15 changed files with 465 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nix/command.cc
View file

@ -81,7 +81,7 @@ StoreCommand::StoreCommand()
void StoreCommand::run()
{
run(openStoreAt(storeUri));
run(openStore(storeUri));
}
StorePathsCommand::StorePathsCommand()

4
src/nix/copy.cc
View file

@ -43,8 +43,8 @@ struct CmdCopy : StorePathsCommand
if (srcUri.empty() && dstUri.empty())
throw UsageError("you must pass ‘--from’ and/or ‘--to’");
ref<Store> srcStore = srcUri.empty() ? store : openStoreAt(srcUri);
ref<Store> dstStore = dstUri.empty() ? store : openStoreAt(dstUri);
ref<Store> srcStore = srcUri.empty() ? store : openStore(srcUri);
ref<Store> dstStore = dstUri.empty() ? store : openStore(dstUri);
std::string copiedLabel = "copied";

2
src/nix/sigs.cc
View file

@ -35,7 +35,7 @@ struct CmdCopySigs : StorePathsCommand
// FIXME: factor out commonality with MixVerify.
std::vector<ref<Store>> substituters;
for (auto & s : substituterUris)
substituters.push_back(openStoreAt(s));
substituters.push_back(openStore(s));
ThreadPool pool;

2
src/nix/verify.cc
View file

@ -52,7 +52,7 @@ struct CmdVerify : StorePathsCommand
{
std::vector<ref<Store>> substituters;
for (auto & s : substituterUris)
substituters.push_back(openStoreAt(s));
substituters.push_back(openStore(s));
auto publicKeys = getDefaultPublicKeys();