* In `fix --instantiate', only print out the hashes of the Nix
descriptors generated out of Fix descriptors specified on the command line. This allows us to say: nix-switch $(fix -i ./test/fixdescriptors/system.fix)
This commit is contained in:
parent
aa8fda4b54
commit
b762f4df7f
|
@ -226,8 +226,6 @@ string instantiateDescriptor(string filename,
|
||||||
if (rename(tmpFilename.c_str(), outFilename.c_str()))
|
if (rename(tmpFilename.c_str(), outFilename.c_str()))
|
||||||
throw Error("cannot rename " + tmpFilename + " to " + outFilename);
|
throw Error("cannot rename " + tmpFilename + " to " + outFilename);
|
||||||
|
|
||||||
cout << outFilename << endl;
|
|
||||||
|
|
||||||
/* Register it with Nix. */
|
/* Register it with Nix. */
|
||||||
registerFile(outFilename);
|
registerFile(outFilename);
|
||||||
|
|
||||||
|
@ -245,7 +243,7 @@ void instantiateDescriptors(Strings filenames)
|
||||||
it != filenames.end(); it++)
|
it != filenames.end(); it++)
|
||||||
{
|
{
|
||||||
string filename = absPath(*it);
|
string filename = absPath(*it);
|
||||||
instantiateDescriptor(filename, done);
|
cout << instantiateDescriptor(filename, done) << endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue