Skip to content

Fix issue #13018, sourceInfo strict in outputs (backport #13026) #13029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2025
Merged

Fix issue #13018, sourceInfo strict in outputs (backport #13026) #13029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a969e2
call-flake.nix: refactor: Bring mapAttrs into scope
roberth Apr 14, 2025
6713647
call-flake.nix: allNodes.${key} -> allNodes.${key}.result
roberth Apr 15, 2025
818fc68
fix: Evaluate flake parent source without evaluating its outputs
roberth Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions src/libflake/call-flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ overrides:
fetchTreeFinal:

let
inherit (builtins) mapAttrs;

lockFile = builtins.fromJSON lockFileStr;

Expand All @@ -35,19 +36,26 @@ let
(resolveInput lockFile.nodes.${nodeName}.inputs.${builtins.head path})
(builtins.tail path);

allNodes = builtins.mapAttrs (
allNodes = mapAttrs (
key: node:
let

parentNode = allNodes.${getInputByPath lockFile.root node.parent};

flakeDir =
let
dir = overrides.${key}.dir or node.locked.path or "";
parentDir = parentNode.flakeDir;
in
if node ? parent then parentDir + ("/" + dir) else dir;

sourceInfo =
if overrides ? ${key} then
overrides.${key}.sourceInfo
else if node.locked.type == "path" && builtins.substring 0 1 node.locked.path != "/" then
parentNode.sourceInfo
// {
outPath = parentNode.outPath + ("/" + node.locked.path);
outPath = parentNode.sourceInfo.outPath + ("/" + flakeDir);
}
else
# FIXME: remove obsolete node.info.
Expand All @@ -60,7 +68,7 @@ let

flake = import (outPath + "/flake.nix");

inputs = builtins.mapAttrs (inputName: inputSpec: allNodes.${resolveInput inputSpec}) (
inputs = mapAttrs (inputName: inputSpec: allNodes.${resolveInput inputSpec}.result) (
node.inputs or { }
);

Expand All @@ -85,12 +93,17 @@ let
};

in
if node.flake or true then
assert builtins.isFunction flake.outputs;
result
else
sourceInfo
{
result =
if node.flake or true then
assert builtins.isFunction flake.outputs;
result
else
sourceInfo;

inherit flakeDir sourceInfo;
}
) lockFile.nodes;

in
allNodes.${lockFile.root}
allNodes.${lockFile.root}.result
21 changes: 21 additions & 0 deletions tests/functional/flakes/relative-paths.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,24 @@ EOF
[[ $(nix eval "$rootFlake#z") = 90 ]]

fi

# https://github.com/NixOS/nix/pull/10089#discussion_r2041984987
# https://github.com/NixOS/nix/issues/13018
mkdir -p "$TEST_ROOT/issue-13018/example"
(
cd "$TEST_ROOT/issue-13018"
git init
echo '{ outputs = _: { }; }' >flake.nix
cat >example/flake.nix <<EOF
{
inputs.parent.url = ../.;
outputs = { parent, ... }: builtins.seq parent { ok = null; };
}
EOF
git add -N .
cd example
# Important: the error does not trigger for an in-memory lock!
nix flake lock
# would fail:
nix eval .#ok
)
Loading