wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 20:41:47 +02:00
Code Activity

<nix/fetchurl.nix>: Restore support for "impure = true"

Browse source
This commit is contained in:
Eelco Dolstra 2024-02-13 14:14:20 +01:00
parent e37d502895
commit bb63bd50e6
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/builtins/fetchurl.cc
View file

@ -20,9 +20,8 @@ void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData)
if (!out)
throw Error("'builtin:fetchurl' requires an 'out' output");
auto dof = std::get_if<DerivationOutput::CAFixed>(&out->raw);
if (!dof)
throw Error("'builtin:fetchurl' must be a fixed-output derivation");
if (!(drv.type().isFixed() || drv.type().isImpure()))
throw Error("'builtin:fetchurl' must be a fixed-output or impure derivation");
auto getAttr = [&](const std::string & name) {
auto i = drv.env.find(name);
@ -67,7 +66,8 @@ void builtinFetchurl(const BasicDerivation & drv, const std::string & netrcData)
};
/* Try the hashed mirrors first. */
if (dof->ca.method.getFileIngestionMethod() == FileIngestionMethod::Flat)
auto dof = std::get_if<DerivationOutput::CAFixed>(&out->raw);
if (dof && dof->ca.method.getFileIngestionMethod() == FileIngestionMethod::Flat)
for (auto hashedMirror : settings.hashedMirrors.get())
try {
if (!hasSuffix(hashedMirror, "/")) hashedMirror += '/';