From a8b3d777fbdaf0b732f129e5be62cd2a1227674b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Sep 2022 15:26:19 +0200 Subject: [PATCH] Revert "Merge pull request #6621 from Kha/nested-follows" This reverts commit c530cda345377370c52a616d608de88b9d67cd40, reversing changes made to 4adcdff5c1d5f9f135c4ec61d690890443c19e6a. --- src/libexpr/flake/flake.cc | 47 ++++++++------------------- src/libexpr/flake/lockfile.cc | 2 +- tests/flakes/follow-paths.sh | 60 ----------------------------------- 3 files changed, 14 insertions(+), 95 deletions(-) diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index 81762a0af..105e76bc6 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -90,11 +90,11 @@ static void expectType(EvalState & state, ValueType type, static std::map parseFlakeInputs( EvalState & state, Value * value, const PosIdx pos, - const std::optional & baseDir, InputPath lockRootPath, unsigned depth); + const std::optional & baseDir, InputPath lockRootPath); static FlakeInput parseFlakeInput(EvalState & state, const std::string & inputName, Value * value, const PosIdx pos, - const std::optional & baseDir, InputPath lockRootPath, unsigned depth) + const std::optional & baseDir, InputPath lockRootPath) { expectType(state, nAttrs, *value, pos); @@ -118,7 +118,7 @@ static FlakeInput parseFlakeInput(EvalState & state, expectType(state, nBool, *attr.value, attr.pos); input.isFlake = attr.value->boolean; } else if (attr.name == sInputs) { - input.overrides = parseFlakeInputs(state, attr.value, attr.pos, baseDir, lockRootPath, depth + 1); + input.overrides = parseFlakeInputs(state, attr.value, attr.pos, baseDir, lockRootPath); } else if (attr.name == sFollows) { expectType(state, nString, *attr.value, attr.pos); auto follows(parseInputPath(attr.value->string.s)); @@ -163,11 +163,7 @@ static FlakeInput parseFlakeInput(EvalState & state, input.ref = parseFlakeRef(*url, baseDir, true, input.isFlake); } - if (!input.follows && !input.ref && depth == 0) - // in `input.nixops.inputs.nixpkgs.url = ...`, we assume `nixops` is from - // the flake registry absent `ref`/`follows`, but we should not assume so - // about `nixpkgs` (where `depth == 1`) as the `nixops` flake should - // determine its default source + if (!input.follows && !input.ref) input.ref = FlakeRef::fromAttrs({{"type", "indirect"}, {"id", inputName}}); return input; @@ -175,7 +171,7 @@ static FlakeInput parseFlakeInput(EvalState & state, static std::map parseFlakeInputs( EvalState & state, Value * value, const PosIdx pos, - const std::optional & baseDir, InputPath lockRootPath, unsigned depth) + const std::optional & baseDir, InputPath lockRootPath) { std::map inputs; @@ -188,8 +184,7 @@ static std::map parseFlakeInputs( inputAttr.value, inputAttr.pos, baseDir, - lockRootPath, - depth)); + lockRootPath)); } return inputs; @@ -235,7 +230,7 @@ static Flake getFlake( auto sInputs = state.symbols.create("inputs"); if (auto inputs = vInfo.attrs->get(sInputs)) - flake.inputs = parseFlakeInputs(state, inputs->value, inputs->pos, flakeDir, lockRootPath, 0); + flake.inputs = parseFlakeInputs(state, inputs->value, inputs->pos, flakeDir, lockRootPath); auto sOutputs = state.symbols.create("outputs"); @@ -318,19 +313,6 @@ Flake getFlake(EvalState & state, const FlakeRef & originalRef, bool allowLookup return getFlake(state, originalRef, allowLookup, flakeCache); } -/* Recursively merge `overrides` into `overrideMap` */ -static void updateOverrides(std::map & overrideMap, const FlakeInputs & overrides, - const InputPath & inputPathPrefix) -{ - for (auto & [id, input] : overrides) { - auto inputPath(inputPathPrefix); - inputPath.push_back(id); - // Do not override existing assignment from outer flake - overrideMap.insert({inputPath, input}); - updateOverrides(overrideMap, input.overrides, inputPath); - } -} - /* Compute an in-memory lock file for the specified top-level flake, and optionally write it to file, if the flake is writable. */ LockedFlake lockFlake( @@ -393,9 +375,12 @@ LockedFlake lockFlake( /* Get the overrides (i.e. attributes of the form 'inputs.nixops.inputs.nixpkgs.url = ...'). */ for (auto & [id, input] : flakeInputs) { - auto inputPath(inputPathPrefix); - inputPath.push_back(id); - updateOverrides(overrides, input.overrides, inputPath); + for (auto & [idOverride, inputOverride] : input.overrides) { + auto inputPath(inputPathPrefix); + inputPath.push_back(id); + inputPath.push_back(idOverride); + overrides.insert_or_assign(inputPath, inputOverride); + } } /* Check whether this input has overrides for a @@ -430,12 +415,6 @@ LockedFlake lockFlake( // Respect the “flakeness” of the input even if we // override it i->second.isFlake = input2.isFlake; - if (!i->second.ref) - i->second.ref = input2.ref; - if (!i->second.follows) - i->second.follows = input2.follows; - // Note that `input.overrides` is not used in the following, - // so no need to merge it here (already done by `updateOverrides`) } auto & input = hasOverride ? i->second : input2; diff --git a/src/libexpr/flake/lockfile.cc b/src/libexpr/flake/lockfile.cc index 384ead05b..60b52d578 100644 --- a/src/libexpr/flake/lockfile.cc +++ b/src/libexpr/flake/lockfile.cc @@ -338,7 +338,7 @@ void LockFile::check() for (auto & [inputPath, input] : inputs) { if (auto follows = std::get_if<1>(&input)) { - if (!follows->empty() && !findInput(*follows)) + if (!follows->empty() && !get(inputs, *follows)) throw Error("input '%s' follows a non-existent input '%s'", printInputPath(inputPath), printInputPath(*follows)); diff --git a/tests/flakes/follow-paths.sh b/tests/flakes/follow-paths.sh index c12dbe0f6..19cc1bafa 100644 --- a/tests/flakes/follow-paths.sh +++ b/tests/flakes/follow-paths.sh @@ -148,63 +148,3 @@ git -C $flakeFollowsA add flake.nix nix flake lock $flakeFollowsA 2>&1 | grep "warning: input 'B' has an override for a non-existent input 'invalid'" nix flake lock $flakeFollowsA 2>&1 | grep "warning: input 'B' has an override for a non-existent input 'invalid2'" - -# Test nested flake overrides: A overrides B/C/D - -cat < $flakeFollowsD/flake.nix -{ outputs = _: {}; } -EOF -cat < $flakeFollowsC/flake.nix -{ - inputs.D.url = "path:nosuchflake"; - outputs = _: {}; -} -EOF -cat < $flakeFollowsB/flake.nix -{ - inputs.C.url = "path:$flakeFollowsC"; - outputs = _: {}; -} -EOF -cat < $flakeFollowsA/flake.nix -{ - inputs.B.url = "path:$flakeFollowsB"; - inputs.D.url = "path:$flakeFollowsD"; - inputs.B.inputs.C.inputs.D.follows = "D"; - outputs = _: {}; -} -EOF - -nix flake lock $flakeFollowsA - -[[ $(jq -c .nodes.C.inputs.D $flakeFollowsA/flake.lock) = '["D"]' ]] - -# Test overlapping flake follows: B has D follow C/D, while A has B/C follow C - -cat < $flakeFollowsC/flake.nix -{ - inputs.D.url = "path:$flakeFollowsD"; - outputs = _: {}; -} -EOF -cat < $flakeFollowsB/flake.nix -{ - inputs.C.url = "path:nosuchflake"; - inputs.D.url = "path:nosuchflake"; - inputs.D.follows = "C/D"; - outputs = _: {}; -} -EOF -cat < $flakeFollowsA/flake.nix -{ - inputs.B.url = "path:$flakeFollowsB"; - inputs.C.url = "path:$flakeFollowsC"; - inputs.B.inputs.C.follows = "C"; - outputs = _: {}; -} -EOF - -# bug was not triggered without recreating the lockfile -nix flake lock $flakeFollowsA --recreate-lock-file - -[[ $(jq -c .nodes.B.inputs.D $flakeFollowsA/flake.lock) = '["B","C","D"]' ]]