Skip to content

Support relative path inputs #71

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
edolstra merged 5 commits into from
Oct 27, 2025
Merged

Support relative path inputs #71

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b568a0
Add support for relative path inputs
edolstra Jan 16, 2025
a7bab49
call-flake.nix: refactor: Bring mapAttrs into scope
roberth Apr 14, 2025
98fed47
call-flake.nix: allNodes.${key} -> allNodes.${key}.result
roberth Apr 15, 2025
17b4665
fix: Evaluate flake parent source without evaluating its outputs
roberth Apr 15, 2025
77a761e
Use correct parent `outPath` for relative path inputs
MattSturgeon May 12, 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
36 changes: 26 additions & 10 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
}:

let
inherit (builtins) mapAttrs;

lockFilePath = src + "/flake.lock";

Expand Down Expand Up @@ -103,7 +104,7 @@ let
let
flake = import (flakeSrc + "/flake.nix");

inputs = builtins.mapAttrs (
inputs = mapAttrs (
n: v:
if v.flake or true then
callFlake4 (fetchTree (v.locked // v.info)) v.inputs
Expand Down Expand Up @@ -196,22 +197,32 @@ let
in
"${toString y'}${pad (toString m)}${pad (toString d)}${pad (toString hours)}${pad (toString minutes)}${pad (toString seconds)}";

allNodes = builtins.mapAttrs (
allNodes = mapAttrs (
key: node:
let
isRelative = node.locked.type or null == "path" && builtins.substring 0 1 node.locked.path != "/";

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

sourceInfo =
if key == lockFile.root then
rootSrc
else if isRelative then
parentNode.sourceInfo
else
fetchTree (node.info or { } // removeAttrs node.locked [ "dir" ]);

subdir = if key == lockFile.root then "" else node.locked.dir or "";

outPath = sourceInfo + ((if subdir == "" then "" else "/") + subdir);
outPath =
if isRelative then
parentNode.outPath + (if node.locked.path == "" then "" else "/" + node.locked.path)
else
sourceInfo.outPath + (if subdir == "" then "" else "/" + subdir);

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 Down Expand Up @@ -254,11 +265,16 @@ 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 sourceInfo outPath; };

inherit outPath sourceInfo;
}
) lockFile.nodes;

result =
Expand All @@ -267,7 +283,7 @@ let
else if lockFile.version == 4 then
callFlake4 rootSrc (lockFile.inputs)
else if lockFile.version >= 5 && lockFile.version <= 7 then
allNodes.${lockFile.root}
allNodes.${lockFile.root}.result
else
throw "lock file '${lockFilePath}' has unsupported version ${toString lockFile.version}";

Expand Down