max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-29 09:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10006 from edolstra/fix-impure-fetchurl

Browse source 
<nix/fetchurl.nix>: Restore support for "impure = true"
This commit is contained in:
Eelco Dolstra 2024-02-13 22:50:55 +01:00 committed by GitHub
commit 2b946aad8e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,9 +23,8 @@ void builtinFetchurl(
if (!out) if (!out)
throw Error("'builtin:fetchurl' requires an 'out' output"); throw Error("'builtin:fetchurl' requires an 'out' output");
auto dof = std::get_if<DerivationOutput::CAFixed>(&out->raw); if (!(drv.type().isFixed() || drv.type().isImpure()))
if (!dof) throw Error("'builtin:fetchurl' must be a fixed-output or impure derivation");
throw Error("'builtin:fetchurl' must be a fixed-output derivation");
auto storePath = outputs.at("out"); auto storePath = outputs.at("out");
auto mainUrl = drv.env.at("url"); auto mainUrl = drv.env.at("url");
@ -64,7 +63,8 @@ void builtinFetchurl(
}; };
/* Try the hashed mirrors first. */ /* 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()) for (auto hashedMirror : settings.hashedMirrors.get())
try { try {
if (!hasSuffix(hashedMirror, "/")) hashedMirror += '/'; if (!hasSuffix(hashedMirror, "/")) hashedMirror += '/';

2
tests/functional/fetchurl.sh
View file

@ -83,4 +83,4 @@ test -L $outPath/symlink
requireDaemonNewerThan "2.20" requireDaemonNewerThan "2.20"
expected=100 expected=100
if [[ -v NIX_DAEMON_PACKAGE ]]; then expected=1; fi # work around the daemon not returning a 100 status correctly if [[ -v NIX_DAEMON_PACKAGE ]]; then expected=1; fi # work around the daemon not returning a 100 status correctly
expectStderr $expected 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' expectStderr $expected 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 or impure derivation'

4
tests/functional/impure-derivations.sh
View file

@ -63,3 +63,7 @@ path5=$(nix build -L --no-link --json --file ./impure-derivations.nix contentAdd
path6=$(nix build -L --no-link --json --file ./impure-derivations.nix inputAddressedAfterCA | jq -r .[].outputs.out) path6=$(nix build -L --no-link --json --file ./impure-derivations.nix inputAddressedAfterCA | jq -r .[].outputs.out)
[[ $(< $path6) = X ]] [[ $(< $path6) = X ]]
[[ $(< $TEST_ROOT/counter) = 5 ]] [[ $(< $TEST_ROOT/counter) = 5 ]]
# Test nix/fetchurl.nix.
path7=$(nix build -L --no-link --print-out-paths --expr "import <nix/fetchurl.nix> { impure = true; url = file://$PWD/impure-derivations.sh; }")
cmp $path7 $PWD/impure-derivations.sh