forked from lix-project/lix
builtin:fetchurl: Ensure a fixed-output derivation
Previously we didn't check that the derivation was fixed-output, so you could use builtin:fetchurl to impurely fetch a file.
This commit is contained in:
parent
ef6d055ace
commit
1ee42c5b88
|
@ -16,6 +16,9 @@ void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData)
|
||||||
writeFile(settings.netrcFile, netrcData, 0600);
|
writeFile(settings.netrcFile, netrcData, 0600);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!drv.type().isFixed())
|
||||||
|
throw Error("'builtin:fetchurl' must be a fixed-output derivation");
|
||||||
|
|
||||||
auto getAttr = [&](const std::string & name) {
|
auto getAttr = [&](const std::string & name) {
|
||||||
auto i = drv.env.find(name);
|
auto i = drv.env.find(name);
|
||||||
if (i == drv.env.end()) throw Error("attribute '%s' missing", name);
|
if (i == drv.env.end()) throw Error("attribute '%s' missing", name);
|
||||||
|
|
|
@ -78,3 +78,6 @@ outPath=$(nix-build -vvvvv --expr 'import <nix/fetchurl.nix>' --argstr url file:
|
||||||
|
|
||||||
test -x $outPath/fetchurl.sh
|
test -x $outPath/fetchurl.sh
|
||||||
test -L $outPath/symlink
|
test -L $outPath/symlink
|
||||||
|
|
||||||
|
# Make sure that *not* passing a outputHash fails.
|
||||||
|
expectStderr 100 nix-build --expr '{ url }: builtins.derivation { name = "nix-cache-info"; system = "x86_64-linux"; builder = "builtin:fetchurl"; inherit url; outputHashMode = "flat"; }' --argstr url file://$narxz 2>&1 | grep 'must be a fixed-output derivation'
|
||||||
|
|
Loading…
Reference in a new issue