wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-08 02:43:54 +02:00
Code Activity

Fix subflake handling

Browse source 
Relative 'path:' flake inputs now use the containing flake's
InputAccessor. This has the following implications:

* They're no longer locked in the lock file.

* They don't cause an additional copy to the store.

* They can reference the containing directory (i.e. a subflake can
  have an input '../foo', so long as it doesn't go outside the
  top-level containing flake).

Note: this is not a complete fix for subflake handling, since the lock
file currently makes it ambiguous what the containing flake is. We'll
probably need to add another field to the lock file for that.

Fixes #6352.
This commit is contained in:
Eelco Dolstra 2022-06-02 13:48:55 +02:00
parent 6ab3b86cf5
commit 8a0a55fe12
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
6 changed files with 69 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/flakes.sh
View file

@ -733,7 +733,9 @@ cat > $flakeFollowsA/flake.nix <<EOF
inputs.foobar.follows = "foobar";
};
foobar.url = "path:$flakeFollowsA/flakeE";
# FIXME: currently absolute path: flakes cannot be locked.
#foobar.url = "path:$flakeFollowsA/flakeE";
foobar.url = "git+file://$flake1Dir";
};
outputs = { ... }: {};
}
@ -743,7 +745,8 @@ cat > $flakeFollowsB/flake.nix <<EOF
{
description = "Flake B";
inputs = {
foobar.url = "path:$flakeFollowsA/flakeE";
#foobar.url = "path:$flakeFollowsA/flakeE";
foobar.url = "git+file://$flake1Dir";
goodoo.follows = "C/goodoo";
C = {
url = "path:./flakeC";
@ -758,7 +761,8 @@ cat > $flakeFollowsC/flake.nix <<EOF
{
description = "Flake C";
inputs = {
foobar.url = "path:$flakeFollowsA/flakeE";
#foobar.url = "path:$flakeFollowsA/flakeE";
foobar.url = "git+file://$flake1Dir";
goodoo.follows = "foobar";
};
outputs = { ... }: {};
@ -823,7 +827,7 @@ nix flake lock $flakeFollowsA
[[ $(jq -c .nodes.B.inputs.foobar $flakeFollowsA/flake.lock) = '"foobar"' ]]
jq -r -c '.nodes | keys | .[]' $flakeFollowsA/flake.lock | grep "^foobar$"
# Ensure a relative path is not allowed to go outside the store path
# Check that subflakes are allowed to access flakes in the parent.
cat > $flakeFollowsA/flake.nix <<EOF
{
description = "Flake A";
@ -836,7 +840,7 @@ EOF
git -C $flakeFollowsA add flake.nix
nix flake lock $flakeFollowsA 2>&1 | grep 'points outside'
nix flake lock $flakeFollowsA
# Test flake in store does not evaluate
rm -rf $badFlakeDir