wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Support locking path inputs

Browse source
This commit is contained in:
Eelco Dolstra 2022-08-16 16:05:43 +02:00
parent 4adb32f7d5
commit a218dd80d6
4 changed files with 43 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/flakes/flakes.sh
View file

@ -221,11 +221,10 @@ cat > $flake3Dir/flake.nix <<EOF
url = git+file://$nonFlakeDir;
flake = false;
};
# FIXME: we can't lock path:// inputs at the moment.
#nonFlakeFile = {
# url = path://$nonFlakeDir/README.md;
# flake = false;
#};
nonFlakeFile = {
url = path://$nonFlakeDir/README.md?lock=1;
flake = false;
};
#nonFlakeFile2 = {
# url = "$nonFlakeDir/README.md";
# flake = false;
@ -246,8 +245,8 @@ cat > $flake3Dir/flake.nix <<EOF
dummy2 = builtins.readFile (builtins.path { name = "source"; path = inputs.flake1; filter = path: type: baseNameOf path == "simple.nix"; } + "/simple.nix");
buildCommand = ''
cat \${inputs.nonFlake}/README.md > \$out
[[ \$(cat \${inputs.nonFlake}/README.md) = \$(cat \${inputs.nonFlakeFile}) ]]
'';
# [[ \$(cat \${inputs.nonFlake}/README.md) = \$(cat \${inputs.nonFlakeFile}) ]]
# [[ \${inputs.nonFlakeFile} = \${inputs.nonFlakeFile2} ]]
};
};

10
tests/flakes/follow-paths.sh
View file

@ -27,9 +27,7 @@ cat > $flakeFollowsA/flake.nix <<EOF
inputs.foobar.follows = "foobar";
};
# FIXME: currently absolute path: flakes cannot be locked.
#foobar.url = "path:$flakeFollowsA/flakeE";
foobar.url = "git+file://$flake1Dir";
foobar.url = "path:$flakeFollowsA/flakeE?lock=1";
};
outputs = { ... }: {};
}
@ -39,8 +37,7 @@ cat > $flakeFollowsB/flake.nix <<EOF
{
description = "Flake B";
inputs = {
#foobar.url = "path:$flakeFollowsA/flakeE";
foobar.url = "git+file://$flake1Dir";
foobar.url = "path:$flakeFollowsA/flakeE?lock=1";
goodoo.follows = "C/goodoo";
C = {
url = "path:./flakeC";
@ -55,8 +52,7 @@ cat > $flakeFollowsC/flake.nix <<EOF
{
description = "Flake C";
inputs = {
#foobar.url = "path:$flakeFollowsA/flakeE";
foobar.url = "git+file://$flake1Dir";
foobar.url = "path:$flakeFollowsA/flakeE?lock=1";
goodoo.follows = "foobar";
};
outputs = { ... }: {};