wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

makeFixedOutputPath(): Drop superfluous HashType argument

Browse source
This commit is contained in:
Eelco Dolstra 2016-07-26 21:25:52 +02:00
parent 06bbfb6004
commit ee22a91ab8
12 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/nix-prefetch-url/nix-prefetch-url.cc
View file

@ -146,7 +146,7 @@ int main(int argc, char * * argv)
Path storePath;
if (args.size() == 2) {
expectedHash = parseHash16or32(ht, args[1]);
storePath = store->makeFixedOutputPath(unpack, ht, expectedHash, name);
storePath = store->makeFixedOutputPath(unpack, expectedHash, name);
if (store->isValidPath(storePath))
hash = expectedHash;
else
@ -197,7 +197,7 @@ int main(int argc, char * * argv)
into the Nix store. */
storePath = store->addToStore(name, tmpFile, unpack, ht);
assert(storePath == store->makeFixedOutputPath(unpack, ht, hash, name));
assert(storePath == store->makeFixedOutputPath(unpack, hash, name));
}
if (!printPath)