2022-07-13 12:40:39 +00:00
|
|
|
source ./common.sh
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2022-07-13 18:16:39 +00:00
|
|
|
requireGit
|
2019-05-07 21:22:47 +00:00
|
|
|
|
|
|
|
clearStore
|
2020-01-21 15:27:53 +00:00
|
|
|
rm -rf $TEST_HOME/.cache $TEST_HOME/.config
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2019-05-01 09:38:48 +00:00
|
|
|
flake1Dir=$TEST_ROOT/flake1
|
|
|
|
flake2Dir=$TEST_ROOT/flake2
|
|
|
|
flake3Dir=$TEST_ROOT/flake3
|
2020-01-27 12:45:49 +00:00
|
|
|
flake5Dir=$TEST_ROOT/flake5
|
2019-06-19 12:48:40 +00:00
|
|
|
flake7Dir=$TEST_ROOT/flake7
|
2019-05-28 08:51:45 +00:00
|
|
|
nonFlakeDir=$TEST_ROOT/nonFlake
|
2021-02-22 20:05:37 +00:00
|
|
|
badFlakeDir=$TEST_ROOT/badFlake
|
2021-02-21 15:41:46 +00:00
|
|
|
flakeGitBare=$TEST_ROOT/flakeGitBare
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2022-07-13 18:46:22 +00:00
|
|
|
for repo in $flake1Dir $flake2Dir $flake3Dir $flake7Dir $nonFlakeDir; do
|
2022-06-02 15:01:28 +00:00
|
|
|
# Give one repo a non-main initial branch.
|
2021-03-03 01:13:20 +00:00
|
|
|
extraArgs=
|
|
|
|
if [[ $repo == $flake2Dir ]]; then
|
|
|
|
extraArgs="--initial-branch=main"
|
|
|
|
fi
|
|
|
|
|
2022-07-13 18:16:39 +00:00
|
|
|
createGitRepo "$repo" "$extraArgs"
|
2019-05-07 21:22:47 +00:00
|
|
|
done
|
|
|
|
|
2022-07-13 18:36:11 +00:00
|
|
|
createSimpleGitFlake $flake1Dir
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2019-05-01 09:38:48 +00:00
|
|
|
cat > $flake2Dir/flake.nix <<EOF
|
2019-05-07 21:22:47 +00:00
|
|
|
{
|
|
|
|
description = "Fnord";
|
|
|
|
|
2019-08-30 11:11:33 +00:00
|
|
|
outputs = { self, flake1 }: rec {
|
Support non-x86_64-linux system types in flakes
A command like
$ nix run nixpkgs#hello
will now build the attribute 'packages.${system}.hello' rather than
'packages.hello'. Note that this does mean that the flake needs to
export an attribute for every system type it supports, and you can't
build on unsupported systems. So 'packages' typically looks like this:
packages = nixpkgs.lib.genAttrs ["x86_64-linux" "i686-linux"] (system: {
hello = ...;
});
The 'checks', 'defaultPackage', 'devShell', 'apps' and 'defaultApp'
outputs similarly are now attrsets that map system types to
derivations/apps. 'nix flake check' checks that the derivations for
all platforms evaluate correctly, but only builds the derivations in
'checks.${system}'.
Fixes #2861. (That issue also talks about access to ~/.config/nixpkgs
and --arg, but I think it's reasonable to say that flakes shouldn't
support those.)
The alternative to attribute selection is to pass the system type as
an argument to the flake's 'outputs' function, e.g. 'outputs = { self,
nixpkgs, system }: ...'. However, that approach would be at odds with
hermetic evaluation and make it impossible to enumerate the packages
provided by a flake.
2019-10-15 15:52:10 +00:00
|
|
|
packages.$system.bar = flake1.packages.$system.foo;
|
2019-05-07 21:22:47 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2019-05-01 09:38:48 +00:00
|
|
|
git -C $flake2Dir add flake.nix
|
|
|
|
git -C $flake2Dir commit -m 'Initial'
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2019-05-01 09:38:48 +00:00
|
|
|
cat > $flake3Dir/flake.nix <<EOF
|
2019-05-09 11:59:50 +00:00
|
|
|
{
|
|
|
|
description = "Fnord";
|
|
|
|
|
2019-08-30 11:11:33 +00:00
|
|
|
outputs = { self, flake2 }: rec {
|
Support non-x86_64-linux system types in flakes
A command like
$ nix run nixpkgs#hello
will now build the attribute 'packages.${system}.hello' rather than
'packages.hello'. Note that this does mean that the flake needs to
export an attribute for every system type it supports, and you can't
build on unsupported systems. So 'packages' typically looks like this:
packages = nixpkgs.lib.genAttrs ["x86_64-linux" "i686-linux"] (system: {
hello = ...;
});
The 'checks', 'defaultPackage', 'devShell', 'apps' and 'defaultApp'
outputs similarly are now attrsets that map system types to
derivations/apps. 'nix flake check' checks that the derivations for
all platforms evaluate correctly, but only builds the derivations in
'checks.${system}'.
Fixes #2861. (That issue also talks about access to ~/.config/nixpkgs
and --arg, but I think it's reasonable to say that flakes shouldn't
support those.)
The alternative to attribute selection is to pass the system type as
an argument to the flake's 'outputs' function, e.g. 'outputs = { self,
nixpkgs, system }: ...'. However, that approach would be at odds with
hermetic evaluation and make it impossible to enumerate the packages
provided by a flake.
2019-10-15 15:52:10 +00:00
|
|
|
packages.$system.xyzzy = flake2.packages.$system.bar;
|
2019-06-19 12:48:40 +00:00
|
|
|
|
|
|
|
checks = {
|
Support non-x86_64-linux system types in flakes
A command like
$ nix run nixpkgs#hello
will now build the attribute 'packages.${system}.hello' rather than
'packages.hello'. Note that this does mean that the flake needs to
export an attribute for every system type it supports, and you can't
build on unsupported systems. So 'packages' typically looks like this:
packages = nixpkgs.lib.genAttrs ["x86_64-linux" "i686-linux"] (system: {
hello = ...;
});
The 'checks', 'defaultPackage', 'devShell', 'apps' and 'defaultApp'
outputs similarly are now attrsets that map system types to
derivations/apps. 'nix flake check' checks that the derivations for
all platforms evaluate correctly, but only builds the derivations in
'checks.${system}'.
Fixes #2861. (That issue also talks about access to ~/.config/nixpkgs
and --arg, but I think it's reasonable to say that flakes shouldn't
support those.)
The alternative to attribute selection is to pass the system type as
an argument to the flake's 'outputs' function, e.g. 'outputs = { self,
nixpkgs, system }: ...'. However, that approach would be at odds with
hermetic evaluation and make it impossible to enumerate the packages
provided by a flake.
2019-10-15 15:52:10 +00:00
|
|
|
xyzzy = packages.$system.xyzzy;
|
2019-06-19 12:48:40 +00:00
|
|
|
};
|
2019-05-09 11:59:50 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2022-12-07 11:58:58 +00:00
|
|
|
cat > $flake3Dir/default.nix <<EOF
|
|
|
|
{ x = 123; }
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git -C $flake3Dir add flake.nix default.nix
|
2019-05-01 09:38:48 +00:00
|
|
|
git -C $flake3Dir commit -m 'Initial'
|
2019-05-09 11:59:50 +00:00
|
|
|
|
2019-05-28 08:51:45 +00:00
|
|
|
cat > $nonFlakeDir/README.md <<EOF
|
2019-06-04 18:56:13 +00:00
|
|
|
FNORD
|
2019-05-28 08:51:45 +00:00
|
|
|
EOF
|
|
|
|
|
|
|
|
git -C $nonFlakeDir add README.md
|
|
|
|
git -C $nonFlakeDir commit -m 'Initial'
|
|
|
|
|
2021-07-02 13:10:57 +00:00
|
|
|
# Construct a custom registry, additionally test the --registry flag
|
|
|
|
nix registry add --registry $registry flake1 git+file://$flake1Dir
|
|
|
|
nix registry add --registry $registry flake2 git+file://$flake2Dir
|
|
|
|
nix registry add --registry $registry flake3 git+file://$flake3Dir
|
|
|
|
nix registry add --registry $registry flake4 flake3
|
|
|
|
nix registry add --registry $registry nixpkgs flake1
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2021-10-27 22:56:36 +00:00
|
|
|
# Test 'nix registry list'.
|
2022-07-13 18:36:11 +00:00
|
|
|
[[ $(nix registry list | wc -l) == 5 ]]
|
2021-12-09 15:26:46 +00:00
|
|
|
nix registry list | grep '^global'
|
|
|
|
nix registry list | grepInverse '^user' # nothing in user registry
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2023-08-19 21:03:31 +00:00
|
|
|
# Test fuzzy and exact flake attribute syntax.
|
|
|
|
expectStderr 1 nix eval flake1#ERROR | grepQuiet "error:.*does not provide attribute.*or 'ERROR'$"
|
|
|
|
expectStderr 1 nix eval flake1#.ERROR | grepQuiet "error:.*does not provide attribute 'ERROR'$"
|
|
|
|
|
2021-03-16 16:19:04 +00:00
|
|
|
# Test 'nix flake metadata'.
|
|
|
|
nix flake metadata flake1
|
2021-12-09 15:26:46 +00:00
|
|
|
nix flake metadata flake1 | grepQuiet 'Locked URL:.*flake1.*'
|
2019-05-16 21:14:27 +00:00
|
|
|
|
2021-03-16 16:19:04 +00:00
|
|
|
# Test 'nix flake metadata' on a local flake.
|
2021-12-09 15:26:46 +00:00
|
|
|
(cd $flake1Dir && nix flake metadata) | grepQuiet 'URL:.*flake1.*'
|
|
|
|
(cd $flake1Dir && nix flake metadata .) | grepQuiet 'URL:.*flake1.*'
|
|
|
|
nix flake metadata $flake1Dir | grepQuiet 'URL:.*flake1.*'
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2021-03-16 16:19:04 +00:00
|
|
|
# Test 'nix flake metadata --json'.
|
|
|
|
json=$(nix flake metadata flake1 --json | jq .)
|
2019-05-07 21:22:47 +00:00
|
|
|
[[ $(echo "$json" | jq -r .description) = 'Bla bla' ]]
|
|
|
|
[[ -d $(echo "$json" | jq -r .path) ]]
|
2019-05-28 18:34:02 +00:00
|
|
|
[[ $(echo "$json" | jq -r .lastModified) = $(git -C $flake1Dir log -n1 --format=%ct) ]]
|
2020-01-29 13:57:57 +00:00
|
|
|
hash1=$(echo "$json" | jq -r .revision)
|
|
|
|
|
2021-10-14 12:44:45 +00:00
|
|
|
echo foo > $flake1Dir/foo
|
|
|
|
git -C $flake1Dir add $flake1Dir/foo
|
|
|
|
[[ $(nix flake metadata flake1 --json --refresh | jq -r .dirtyRevision) == "$hash1-dirty" ]]
|
|
|
|
|
2020-01-29 13:57:57 +00:00
|
|
|
echo -n '# foo' >> $flake1Dir/flake.nix
|
2023-03-19 13:11:19 +00:00
|
|
|
flake1OriginalCommit=$(git -C $flake1Dir rev-parse HEAD)
|
2020-01-29 13:57:57 +00:00
|
|
|
git -C $flake1Dir commit -a -m 'Foo'
|
2023-03-19 13:11:19 +00:00
|
|
|
flake1NewCommit=$(git -C $flake1Dir rev-parse HEAD)
|
2021-03-16 16:19:04 +00:00
|
|
|
hash2=$(nix flake metadata flake1 --json --refresh | jq -r .revision)
|
2021-10-14 12:44:45 +00:00
|
|
|
[[ $(nix flake metadata flake1 --json --refresh | jq -r .dirtyRevision) == "null" ]]
|
2020-01-29 13:57:57 +00:00
|
|
|
[[ $hash1 != $hash2 ]]
|
2019-05-07 21:22:47 +00:00
|
|
|
|
|
|
|
# Test 'nix build' on a flake.
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result flake1#foo
|
2019-05-07 21:22:47 +00:00
|
|
|
[[ -e $TEST_ROOT/result/hello ]]
|
|
|
|
|
2022-02-11 17:11:08 +00:00
|
|
|
# Test packages.default.
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result flake1
|
2019-05-07 21:22:47 +00:00
|
|
|
[[ -e $TEST_ROOT/result/hello ]]
|
|
|
|
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result $flake1Dir
|
|
|
|
nix build -o $TEST_ROOT/result git+file://$flake1Dir
|
2019-05-31 20:17:39 +00:00
|
|
|
|
2020-01-21 15:27:53 +00:00
|
|
|
# Check that store symlinks inside a flake are not interpreted as flakes.
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $flake1Dir/result git+file://$flake1Dir
|
2019-06-21 13:29:05 +00:00
|
|
|
nix path-info $flake1Dir/result
|
|
|
|
|
2022-12-07 11:58:58 +00:00
|
|
|
# 'getFlake' on an unlocked flakeref should fail in pure mode, but
|
|
|
|
# succeed in impure mode.
|
2022-02-11 17:11:08 +00:00
|
|
|
(! nix build -o $TEST_ROOT/result --expr "(builtins.getFlake \"$flake1Dir\").packages.$system.default")
|
|
|
|
nix build -o $TEST_ROOT/result --expr "(builtins.getFlake \"$flake1Dir\").packages.$system.default" --impure
|
2020-04-03 11:07:05 +00:00
|
|
|
|
2022-12-07 11:58:58 +00:00
|
|
|
# 'getFlake' on a locked flakeref should succeed even in pure mode.
|
2022-02-11 17:11:08 +00:00
|
|
|
nix build -o $TEST_ROOT/result --expr "(builtins.getFlake \"git+file://$flake1Dir?rev=$hash2\").packages.$system.default"
|
2020-04-03 11:07:05 +00:00
|
|
|
|
2019-05-07 21:22:47 +00:00
|
|
|
# Building a flake with an unlocked dependency should fail in pure mode.
|
2020-01-28 15:34:37 +00:00
|
|
|
(! nix build -o $TEST_ROOT/result flake2#bar --no-registries)
|
2021-07-02 12:36:14 +00:00
|
|
|
(! nix build -o $TEST_ROOT/result flake2#bar --no-use-registries)
|
2020-01-27 12:45:49 +00:00
|
|
|
(! nix eval --expr "builtins.getFlake \"$flake2Dir\"")
|
2019-05-07 21:22:47 +00:00
|
|
|
|
|
|
|
# But should succeed in impure mode.
|
2020-01-29 20:01:34 +00:00
|
|
|
(! nix build -o $TEST_ROOT/result flake2#bar --impure)
|
|
|
|
nix build -o $TEST_ROOT/result flake2#bar --impure --no-write-lock-file
|
2022-05-18 09:33:04 +00:00
|
|
|
nix eval --expr "builtins.getFlake \"$flake2Dir\"" --impure
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2020-01-29 20:01:34 +00:00
|
|
|
# Building a local flake with an unlocked dependency should fail with --no-update-lock-file.
|
2021-12-09 15:26:46 +00:00
|
|
|
expect 1 nix build -o $TEST_ROOT/result $flake2Dir#bar --no-update-lock-file 2>&1 | grep 'requires lock file changes'
|
2020-01-29 20:01:34 +00:00
|
|
|
|
|
|
|
# But it should succeed without that flag.
|
|
|
|
nix build -o $TEST_ROOT/result $flake2Dir#bar --no-write-lock-file
|
2021-12-09 15:26:46 +00:00
|
|
|
expect 1 nix build -o $TEST_ROOT/result $flake2Dir#bar --no-update-lock-file 2>&1 | grep 'requires lock file changes'
|
2020-02-05 13:48:49 +00:00
|
|
|
nix build -o $TEST_ROOT/result $flake2Dir#bar --commit-lock-file
|
2019-05-01 09:38:48 +00:00
|
|
|
[[ -e $flake2Dir/flake.lock ]]
|
2022-06-02 15:01:28 +00:00
|
|
|
[[ -z $(git -C $flake2Dir diff main || echo failed) ]]
|
2019-05-07 21:22:47 +00:00
|
|
|
|
2019-05-09 11:55:33 +00:00
|
|
|
# Rerunning the build should not change the lockfile.
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result $flake2Dir#bar
|
2022-06-02 15:01:28 +00:00
|
|
|
[[ -z $(git -C $flake2Dir diff main || echo failed) ]]
|
2019-05-09 11:55:33 +00:00
|
|
|
|
2019-06-21 16:34:43 +00:00
|
|
|
# Building with a lockfile should not require a fetch of the registry.
|
2020-02-02 11:47:21 +00:00
|
|
|
nix build -o $TEST_ROOT/result --flake-registry file:///no-registry.json $flake2Dir#bar --refresh
|
|
|
|
nix build -o $TEST_ROOT/result --no-registries $flake2Dir#bar --refresh
|
2021-07-02 12:36:14 +00:00
|
|
|
nix build -o $TEST_ROOT/result --no-use-registries $flake2Dir#bar --refresh
|
2019-06-21 16:34:43 +00:00
|
|
|
|
2019-06-19 12:48:40 +00:00
|
|
|
# Updating the flake should not change the lockfile.
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake2Dir
|
2022-06-02 15:01:28 +00:00
|
|
|
[[ -z $(git -C $flake2Dir diff main || echo failed) ]]
|
2019-06-19 12:48:40 +00:00
|
|
|
|
2019-05-07 21:22:47 +00:00
|
|
|
# Now we should be able to build the flake in pure mode.
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result flake2#bar
|
2019-05-07 21:22:47 +00:00
|
|
|
|
|
|
|
# Or without a registry.
|
2020-02-02 11:47:21 +00:00
|
|
|
nix build -o $TEST_ROOT/result --no-registries git+file://$flake2Dir#bar --refresh
|
2021-07-02 12:36:14 +00:00
|
|
|
nix build -o $TEST_ROOT/result --no-use-registries git+file://$flake2Dir#bar --refresh
|
2019-05-09 11:59:50 +00:00
|
|
|
|
|
|
|
# Test whether indirect dependencies work.
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result $flake3Dir#xyzzy
|
2020-01-21 15:27:53 +00:00
|
|
|
git -C $flake3Dir add flake.lock
|
2019-05-14 09:34:45 +00:00
|
|
|
|
2019-05-22 12:31:40 +00:00
|
|
|
# Add dependency to flake3.
|
2019-05-14 09:34:45 +00:00
|
|
|
rm $flake3Dir/flake.nix
|
|
|
|
|
|
|
|
cat > $flake3Dir/flake.nix <<EOF
|
|
|
|
{
|
|
|
|
description = "Fnord";
|
|
|
|
|
2019-08-30 11:11:33 +00:00
|
|
|
outputs = { self, flake1, flake2 }: rec {
|
Support non-x86_64-linux system types in flakes
A command like
$ nix run nixpkgs#hello
will now build the attribute 'packages.${system}.hello' rather than
'packages.hello'. Note that this does mean that the flake needs to
export an attribute for every system type it supports, and you can't
build on unsupported systems. So 'packages' typically looks like this:
packages = nixpkgs.lib.genAttrs ["x86_64-linux" "i686-linux"] (system: {
hello = ...;
});
The 'checks', 'defaultPackage', 'devShell', 'apps' and 'defaultApp'
outputs similarly are now attrsets that map system types to
derivations/apps. 'nix flake check' checks that the derivations for
all platforms evaluate correctly, but only builds the derivations in
'checks.${system}'.
Fixes #2861. (That issue also talks about access to ~/.config/nixpkgs
and --arg, but I think it's reasonable to say that flakes shouldn't
support those.)
The alternative to attribute selection is to pass the system type as
an argument to the flake's 'outputs' function, e.g. 'outputs = { self,
nixpkgs, system }: ...'. However, that approach would be at odds with
hermetic evaluation and make it impossible to enumerate the packages
provided by a flake.
2019-10-15 15:52:10 +00:00
|
|
|
packages.$system.xyzzy = flake2.packages.$system.bar;
|
|
|
|
packages.$system."sth sth" = flake1.packages.$system.foo;
|
2019-05-14 09:34:45 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git -C $flake3Dir add flake.nix
|
|
|
|
git -C $flake3Dir commit -m 'Update flake.nix'
|
|
|
|
|
|
|
|
# Check whether `nix build` works with an incomplete lockfile
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result $flake3Dir#"sth sth"
|
|
|
|
nix build -o $TEST_ROOT/result $flake3Dir#"sth%20sth"
|
2019-05-14 09:34:45 +00:00
|
|
|
|
|
|
|
# Check whether it saved the lockfile
|
2022-06-02 15:01:28 +00:00
|
|
|
[[ -n $(git -C $flake3Dir diff master) ]]
|
2019-05-22 12:31:40 +00:00
|
|
|
|
2019-07-12 12:37:45 +00:00
|
|
|
git -C $flake3Dir add flake.lock
|
|
|
|
|
2019-06-04 17:10:35 +00:00
|
|
|
git -C $flake3Dir commit -m 'Add lockfile'
|
|
|
|
|
2019-05-22 21:52:29 +00:00
|
|
|
# Test whether registry caching works.
|
2021-12-09 15:26:46 +00:00
|
|
|
nix registry list --flake-registry file://$registry | grepQuiet flake3
|
2020-03-19 10:42:50 +00:00
|
|
|
mv $registry $registry.tmp
|
2021-01-10 22:20:02 +00:00
|
|
|
nix store gc
|
2021-12-09 15:26:46 +00:00
|
|
|
nix registry list --flake-registry file://$registry --refresh | grepQuiet flake3
|
2020-03-19 10:42:50 +00:00
|
|
|
mv $registry.tmp $registry
|
2019-05-23 21:42:13 +00:00
|
|
|
|
|
|
|
# Test whether flakes are registered as GC roots for offline use.
|
2019-06-04 17:45:16 +00:00
|
|
|
# FIXME: use tarballs rather than git.
|
2019-05-23 21:42:13 +00:00
|
|
|
rm -rf $TEST_HOME/.cache
|
2021-01-10 22:20:02 +00:00
|
|
|
nix store gc # get rid of copies in the store to ensure they get fetched to our git cache
|
2020-01-28 15:34:37 +00:00
|
|
|
_NIX_FORCE_HTTP=1 nix build -o $TEST_ROOT/result git+file://$flake2Dir#bar
|
2019-05-23 21:42:13 +00:00
|
|
|
mv $flake1Dir $flake1Dir.tmp
|
|
|
|
mv $flake2Dir $flake2Dir.tmp
|
2021-01-10 22:20:02 +00:00
|
|
|
nix store gc
|
2020-01-28 15:34:37 +00:00
|
|
|
_NIX_FORCE_HTTP=1 nix build -o $TEST_ROOT/result git+file://$flake2Dir#bar
|
2020-02-02 11:47:21 +00:00
|
|
|
_NIX_FORCE_HTTP=1 nix build -o $TEST_ROOT/result git+file://$flake2Dir#bar --refresh
|
2019-05-23 21:42:13 +00:00
|
|
|
mv $flake1Dir.tmp $flake1Dir
|
|
|
|
mv $flake2Dir.tmp $flake2Dir
|
2019-05-28 08:51:45 +00:00
|
|
|
|
2019-05-29 21:09:23 +00:00
|
|
|
# Add nonFlakeInputs to flake3.
|
2019-05-28 08:51:45 +00:00
|
|
|
rm $flake3Dir/flake.nix
|
|
|
|
|
|
|
|
cat > $flake3Dir/flake.nix <<EOF
|
|
|
|
{
|
2019-08-30 14:27:51 +00:00
|
|
|
inputs = {
|
|
|
|
flake1 = {};
|
|
|
|
flake2 = {};
|
|
|
|
nonFlake = {
|
2020-01-21 15:27:53 +00:00
|
|
|
url = git+file://$nonFlakeDir;
|
2019-08-30 14:27:51 +00:00
|
|
|
flake = false;
|
|
|
|
};
|
2021-12-13 19:54:43 +00:00
|
|
|
nonFlakeFile = {
|
|
|
|
url = path://$nonFlakeDir/README.md;
|
|
|
|
flake = false;
|
|
|
|
};
|
|
|
|
nonFlakeFile2 = {
|
|
|
|
url = "$nonFlakeDir/README.md";
|
|
|
|
flake = false;
|
|
|
|
};
|
2019-05-28 08:51:45 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
description = "Fnord";
|
|
|
|
|
2019-05-29 21:09:23 +00:00
|
|
|
outputs = inputs: rec {
|
Support non-x86_64-linux system types in flakes
A command like
$ nix run nixpkgs#hello
will now build the attribute 'packages.${system}.hello' rather than
'packages.hello'. Note that this does mean that the flake needs to
export an attribute for every system type it supports, and you can't
build on unsupported systems. So 'packages' typically looks like this:
packages = nixpkgs.lib.genAttrs ["x86_64-linux" "i686-linux"] (system: {
hello = ...;
});
The 'checks', 'defaultPackage', 'devShell', 'apps' and 'defaultApp'
outputs similarly are now attrsets that map system types to
derivations/apps. 'nix flake check' checks that the derivations for
all platforms evaluate correctly, but only builds the derivations in
'checks.${system}'.
Fixes #2861. (That issue also talks about access to ~/.config/nixpkgs
and --arg, but I think it's reasonable to say that flakes shouldn't
support those.)
The alternative to attribute selection is to pass the system type as
an argument to the flake's 'outputs' function, e.g. 'outputs = { self,
nixpkgs, system }: ...'. However, that approach would be at odds with
hermetic evaluation and make it impossible to enumerate the packages
provided by a flake.
2019-10-15 15:52:10 +00:00
|
|
|
packages.$system.xyzzy = inputs.flake2.packages.$system.bar;
|
|
|
|
packages.$system.sth = inputs.flake1.packages.$system.foo;
|
|
|
|
packages.$system.fnord =
|
2019-06-04 18:56:13 +00:00
|
|
|
with import ./config.nix;
|
|
|
|
mkDerivation {
|
|
|
|
inherit system;
|
|
|
|
name = "fnord";
|
2021-10-06 18:53:29 +00:00
|
|
|
dummy = builtins.readFile (builtins.path { name = "source"; path = ./.; filter = path: type: baseNameOf path == "config.nix"; } + "/config.nix");
|
2021-10-07 11:43:17 +00:00
|
|
|
dummy2 = builtins.readFile (builtins.path { name = "source"; path = inputs.flake1; filter = path: type: baseNameOf path == "simple.nix"; } + "/simple.nix");
|
2019-06-04 18:56:13 +00:00
|
|
|
buildCommand = ''
|
|
|
|
cat \${inputs.nonFlake}/README.md > \$out
|
2021-12-13 19:54:43 +00:00
|
|
|
[[ \$(cat \${inputs.nonFlake}/README.md) = \$(cat \${inputs.nonFlakeFile}) ]]
|
|
|
|
[[ \${inputs.nonFlakeFile} = \${inputs.nonFlakeFile2} ]]
|
2019-06-04 18:56:13 +00:00
|
|
|
'';
|
|
|
|
};
|
2019-05-28 08:51:45 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2022-07-13 12:09:35 +00:00
|
|
|
cp ../config.nix $flake3Dir
|
2019-06-04 18:56:13 +00:00
|
|
|
|
|
|
|
git -C $flake3Dir add flake.nix config.nix
|
2019-05-29 21:09:23 +00:00
|
|
|
git -C $flake3Dir commit -m 'Add nonFlakeInputs'
|
2019-05-28 08:51:45 +00:00
|
|
|
|
2019-06-04 18:56:13 +00:00
|
|
|
# Check whether `nix build` works with a lockfile which is missing a
|
|
|
|
# nonFlakeInputs.
|
2020-02-05 13:48:49 +00:00
|
|
|
nix build -o $TEST_ROOT/result $flake3Dir#sth --commit-lock-file
|
2024-06-23 13:03:37 +00:00
|
|
|
# check that the commit message is broadly correct. we can't check for
|
|
|
|
# exact contents of the message becase the build dirs change too much.
|
|
|
|
[[ "$(git -C $flake3Dir show -s --format=format:%B)" = \
|
|
|
|
"flake.lock: Update
|
|
|
|
|
|
|
|
Flake lock file updates:
|
|
|
|
|
|
|
|
"?" Added input 'nonFlake':
|
|
|
|
'git+file://"*"/flakes/flakes/nonFlake?ref=refs/heads/master&rev="*"' "*"
|
|
|
|
"?" Added input 'nonFlakeFile':
|
|
|
|
'path:"*"/flakes/flakes/nonFlake/README.md?lastModified="*"&narHash=sha256-cPh6hp48IOdRxVV3xGd0PDgSxgzj5N/2cK0rMPNaR4o%3D' "*"
|
|
|
|
"?" Added input 'nonFlakeFile2':
|
|
|
|
'path:"*"/flakes/flakes/nonFlake/README.md?lastModified="*"&narHash=sha256-cPh6hp48IOdRxVV3xGd0PDgSxgzj5N/2cK0rMPNaR4o%3D' "* ]]
|
2019-06-04 18:33:49 +00:00
|
|
|
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result flake3#fnord
|
2019-06-04 18:56:13 +00:00
|
|
|
[[ $(cat $TEST_ROOT/result) = FNORD ]]
|
|
|
|
|
2019-09-20 14:01:40 +00:00
|
|
|
# Check whether flake input fetching is lazy: flake3#sth does not
|
2019-06-04 17:10:35 +00:00
|
|
|
# depend on flake2, so this shouldn't fail.
|
|
|
|
rm -rf $TEST_HOME/.cache
|
|
|
|
clearStore
|
|
|
|
mv $flake2Dir $flake2Dir.tmp
|
2019-06-04 18:56:13 +00:00
|
|
|
mv $nonFlakeDir $nonFlakeDir.tmp
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result flake3#sth
|
|
|
|
(! nix build -o $TEST_ROOT/result flake3#xyzzy)
|
|
|
|
(! nix build -o $TEST_ROOT/result flake3#fnord)
|
2019-06-04 17:10:35 +00:00
|
|
|
mv $flake2Dir.tmp $flake2Dir
|
2019-06-04 18:56:13 +00:00
|
|
|
mv $nonFlakeDir.tmp $nonFlakeDir
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result flake3#xyzzy flake3#fnord
|
2019-06-11 11:09:06 +00:00
|
|
|
|
|
|
|
# Test doing multiple `lookupFlake`s
|
2020-01-28 15:34:37 +00:00
|
|
|
nix build -o $TEST_ROOT/result flake4#xyzzy
|
2019-06-11 11:09:06 +00:00
|
|
|
|
2020-01-22 19:00:58 +00:00
|
|
|
# Test 'nix flake update' and --override-flake.
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake3Dir
|
2022-06-02 15:01:28 +00:00
|
|
|
[[ -z $(git -C $flake3Dir diff master || echo failed) ]]
|
2020-01-22 19:00:58 +00:00
|
|
|
|
2023-10-31 15:19:05 +00:00
|
|
|
nix flake update --flake "$flake3Dir" --override-flake flake2 nixpkgs
|
|
|
|
[[ ! -z $(git -C "$flake3Dir" diff master || echo failed) ]]
|
2020-01-22 19:00:58 +00:00
|
|
|
|
2019-06-11 11:09:06 +00:00
|
|
|
# Make branch "removeXyzzy" where flake3 doesn't have xyzzy anymore
|
|
|
|
git -C $flake3Dir checkout -b removeXyzzy
|
|
|
|
rm $flake3Dir/flake.nix
|
|
|
|
|
|
|
|
cat > $flake3Dir/flake.nix <<EOF
|
|
|
|
{
|
2019-08-30 14:27:51 +00:00
|
|
|
inputs = {
|
|
|
|
nonFlake = {
|
2019-10-08 14:30:04 +00:00
|
|
|
url = "$nonFlakeDir";
|
2019-08-30 14:27:51 +00:00
|
|
|
flake = false;
|
|
|
|
};
|
2019-06-11 11:09:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
description = "Fnord";
|
|
|
|
|
2019-08-30 14:27:51 +00:00
|
|
|
outputs = { self, flake1, flake2, nonFlake }: rec {
|
Support non-x86_64-linux system types in flakes
A command like
$ nix run nixpkgs#hello
will now build the attribute 'packages.${system}.hello' rather than
'packages.hello'. Note that this does mean that the flake needs to
export an attribute for every system type it supports, and you can't
build on unsupported systems. So 'packages' typically looks like this:
packages = nixpkgs.lib.genAttrs ["x86_64-linux" "i686-linux"] (system: {
hello = ...;
});
The 'checks', 'defaultPackage', 'devShell', 'apps' and 'defaultApp'
outputs similarly are now attrsets that map system types to
derivations/apps. 'nix flake check' checks that the derivations for
all platforms evaluate correctly, but only builds the derivations in
'checks.${system}'.
Fixes #2861. (That issue also talks about access to ~/.config/nixpkgs
and --arg, but I think it's reasonable to say that flakes shouldn't
support those.)
The alternative to attribute selection is to pass the system type as
an argument to the flake's 'outputs' function, e.g. 'outputs = { self,
nixpkgs, system }: ...'. However, that approach would be at odds with
hermetic evaluation and make it impossible to enumerate the packages
provided by a flake.
2019-10-15 15:52:10 +00:00
|
|
|
packages.$system.sth = flake1.packages.$system.foo;
|
|
|
|
packages.$system.fnord =
|
2019-06-11 11:09:06 +00:00
|
|
|
with import ./config.nix;
|
|
|
|
mkDerivation {
|
|
|
|
inherit system;
|
|
|
|
name = "fnord";
|
|
|
|
buildCommand = ''
|
2019-08-30 14:27:51 +00:00
|
|
|
cat \${nonFlake}/README.md > \$out
|
2019-06-11 11:09:06 +00:00
|
|
|
'';
|
|
|
|
};
|
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake3Dir
|
2020-07-17 12:54:21 +00:00
|
|
|
git -C $flake3Dir add flake.nix flake.lock
|
2019-06-11 11:09:06 +00:00
|
|
|
git -C $flake3Dir commit -m 'Remove packages.xyzzy'
|
|
|
|
git -C $flake3Dir checkout master
|
|
|
|
|
2020-07-17 12:54:21 +00:00
|
|
|
# Test whether fuzzy-matching works for registry entries.
|
2020-01-28 15:34:37 +00:00
|
|
|
(! nix build -o $TEST_ROOT/result flake4/removeXyzzy#xyzzy)
|
|
|
|
nix build -o $TEST_ROOT/result flake4/removeXyzzy#sth
|
2019-06-19 12:48:40 +00:00
|
|
|
|
|
|
|
# Testing the nix CLI
|
2020-05-15 12:38:10 +00:00
|
|
|
nix registry add flake1 flake3
|
2022-07-13 18:36:11 +00:00
|
|
|
[[ $(nix registry list | wc -l) == 6 ]]
|
2020-05-15 12:38:10 +00:00
|
|
|
nix registry pin flake1
|
2022-07-13 18:36:11 +00:00
|
|
|
[[ $(nix registry list | wc -l) == 6 ]]
|
2021-07-02 13:10:57 +00:00
|
|
|
nix registry pin flake1 flake3
|
2022-07-13 12:40:39 +00:00
|
|
|
[[ $(nix registry list | wc -l) == 6 ]]
|
2022-07-13 18:36:11 +00:00
|
|
|
nix registry remove flake1
|
|
|
|
[[ $(nix registry list | wc -l) == 5 ]]
|
2020-06-04 18:02:50 +00:00
|
|
|
|
2021-10-27 22:56:36 +00:00
|
|
|
# Test 'nix registry list' with a disabled global registry.
|
|
|
|
nix registry add user-flake1 git+file://$flake1Dir
|
|
|
|
nix registry add user-flake2 git+file://$flake2Dir
|
|
|
|
[[ $(nix --flake-registry "" registry list | wc -l) == 2 ]]
|
2021-12-09 15:26:46 +00:00
|
|
|
nix --flake-registry "" registry list | grepQuietInverse '^global' # nothing in global registry
|
|
|
|
nix --flake-registry "" registry list | grepQuiet '^user'
|
2021-10-27 22:56:36 +00:00
|
|
|
nix registry remove user-flake1
|
|
|
|
nix registry remove user-flake2
|
|
|
|
[[ $(nix registry list | wc -l) == 5 ]]
|
|
|
|
|
Respect lock files of inputs + fine-grained lock file control
When computing a lock file, we now respect the lock files of flake
inputs. This is important for usability / reproducibility. For
example, the 'nixops' flake depends on the 'nixops-aws' and
'nixops-hetzner' repositories. So when the 'nixops' flake is used in
another flake, we want the versions of 'nixops-aws' and
'nixops-hetzner' locked by the the 'nixops' flake because those
presumably have been tested.
This can lead to a proliferation of versions of flakes like 'nixpkgs'
(since every flake's lock file could depend on a different version of
'nixpkgs'). This is not a major issue when using Nixpkgs overlays or
NixOS modules, since then the top-level flake composes those
overlays/modules into *its* version of Nixpkgs and all other versions
are ignored. Lock file computation has been made a bit more lazy so it
won't try to fetch all those versions of 'nixpkgs'.
However, in case it's necessary to minimize flake versions, there now
are two input attributes that allow this. First, you can copy an input
from another flake, as follows:
inputs.nixpkgs.follows = "dwarffs/nixpkgs";
This states that the calling flake's 'nixpkgs' input shall be the same
as the 'nixpkgs' input of the 'dwarffs' input.
Second, you can override inputs of inputs:
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
or equivalently, using 'follows':
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
This states that the 'nixpkgs' input of the 'nixops' input shall be
the same as the calling flake's 'nixpkgs' input.
Finally, at '-v' Nix now prints the changes to the lock file, e.g.
$ nix flake update ~/Misc/eelco-configurations/hagbard
inputs of flake 'git+file:///home/eelco/Misc/eelco-configurations?subdir=hagbard' changed:
updated 'nixpkgs': 'github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9' -> 'github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd'
removed 'nixops'
removed 'nixops/nixops-aws'
removed 'nixops/nixops-hetzner'
removed 'nixops/nixpkgs'
2020-01-24 21:05:11 +00:00
|
|
|
# Test 'nix flake clone'.
|
2019-08-30 11:11:33 +00:00
|
|
|
rm -rf $TEST_ROOT/flake1-v2
|
2020-01-28 15:34:37 +00:00
|
|
|
nix flake clone flake1 --dest $TEST_ROOT/flake1-v2
|
2020-01-21 15:27:53 +00:00
|
|
|
[ -e $TEST_ROOT/flake1-v2/flake.nix ]
|
2019-09-10 14:03:03 +00:00
|
|
|
|
Respect lock files of inputs + fine-grained lock file control
When computing a lock file, we now respect the lock files of flake
inputs. This is important for usability / reproducibility. For
example, the 'nixops' flake depends on the 'nixops-aws' and
'nixops-hetzner' repositories. So when the 'nixops' flake is used in
another flake, we want the versions of 'nixops-aws' and
'nixops-hetzner' locked by the the 'nixops' flake because those
presumably have been tested.
This can lead to a proliferation of versions of flakes like 'nixpkgs'
(since every flake's lock file could depend on a different version of
'nixpkgs'). This is not a major issue when using Nixpkgs overlays or
NixOS modules, since then the top-level flake composes those
overlays/modules into *its* version of Nixpkgs and all other versions
are ignored. Lock file computation has been made a bit more lazy so it
won't try to fetch all those versions of 'nixpkgs'.
However, in case it's necessary to minimize flake versions, there now
are two input attributes that allow this. First, you can copy an input
from another flake, as follows:
inputs.nixpkgs.follows = "dwarffs/nixpkgs";
This states that the calling flake's 'nixpkgs' input shall be the same
as the 'nixpkgs' input of the 'dwarffs' input.
Second, you can override inputs of inputs:
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
or equivalently, using 'follows':
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
This states that the 'nixpkgs' input of the 'nixops' input shall be
the same as the calling flake's 'nixpkgs' input.
Finally, at '-v' Nix now prints the changes to the lock file, e.g.
$ nix flake update ~/Misc/eelco-configurations/hagbard
inputs of flake 'git+file:///home/eelco/Misc/eelco-configurations?subdir=hagbard' changed:
updated 'nixpkgs': 'github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9' -> 'github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd'
removed 'nixops'
removed 'nixops/nixops-aws'
removed 'nixops/nixops-hetzner'
removed 'nixops/nixpkgs'
2020-01-24 21:05:11 +00:00
|
|
|
# Test 'follows' inputs.
|
|
|
|
cat > $flake3Dir/flake.nix <<EOF
|
|
|
|
{
|
2020-01-31 19:50:46 +00:00
|
|
|
inputs.foo = {
|
|
|
|
type = "indirect";
|
|
|
|
id = "flake1";
|
|
|
|
};
|
Respect lock files of inputs + fine-grained lock file control
When computing a lock file, we now respect the lock files of flake
inputs. This is important for usability / reproducibility. For
example, the 'nixops' flake depends on the 'nixops-aws' and
'nixops-hetzner' repositories. So when the 'nixops' flake is used in
another flake, we want the versions of 'nixops-aws' and
'nixops-hetzner' locked by the the 'nixops' flake because those
presumably have been tested.
This can lead to a proliferation of versions of flakes like 'nixpkgs'
(since every flake's lock file could depend on a different version of
'nixpkgs'). This is not a major issue when using Nixpkgs overlays or
NixOS modules, since then the top-level flake composes those
overlays/modules into *its* version of Nixpkgs and all other versions
are ignored. Lock file computation has been made a bit more lazy so it
won't try to fetch all those versions of 'nixpkgs'.
However, in case it's necessary to minimize flake versions, there now
are two input attributes that allow this. First, you can copy an input
from another flake, as follows:
inputs.nixpkgs.follows = "dwarffs/nixpkgs";
This states that the calling flake's 'nixpkgs' input shall be the same
as the 'nixpkgs' input of the 'dwarffs' input.
Second, you can override inputs of inputs:
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
or equivalently, using 'follows':
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
This states that the 'nixpkgs' input of the 'nixops' input shall be
the same as the calling flake's 'nixpkgs' input.
Finally, at '-v' Nix now prints the changes to the lock file, e.g.
$ nix flake update ~/Misc/eelco-configurations/hagbard
inputs of flake 'git+file:///home/eelco/Misc/eelco-configurations?subdir=hagbard' changed:
updated 'nixpkgs': 'github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9' -> 'github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd'
removed 'nixops'
removed 'nixops/nixops-aws'
removed 'nixops/nixops-hetzner'
removed 'nixops/nixpkgs'
2020-01-24 21:05:11 +00:00
|
|
|
inputs.bar.follows = "foo";
|
|
|
|
|
|
|
|
outputs = { self, foo, bar }: {
|
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake3Dir
|
2020-06-11 12:40:21 +00:00
|
|
|
[[ $(jq -c .nodes.root.inputs.bar $flake3Dir/flake.lock) = '["foo"]' ]]
|
Respect lock files of inputs + fine-grained lock file control
When computing a lock file, we now respect the lock files of flake
inputs. This is important for usability / reproducibility. For
example, the 'nixops' flake depends on the 'nixops-aws' and
'nixops-hetzner' repositories. So when the 'nixops' flake is used in
another flake, we want the versions of 'nixops-aws' and
'nixops-hetzner' locked by the the 'nixops' flake because those
presumably have been tested.
This can lead to a proliferation of versions of flakes like 'nixpkgs'
(since every flake's lock file could depend on a different version of
'nixpkgs'). This is not a major issue when using Nixpkgs overlays or
NixOS modules, since then the top-level flake composes those
overlays/modules into *its* version of Nixpkgs and all other versions
are ignored. Lock file computation has been made a bit more lazy so it
won't try to fetch all those versions of 'nixpkgs'.
However, in case it's necessary to minimize flake versions, there now
are two input attributes that allow this. First, you can copy an input
from another flake, as follows:
inputs.nixpkgs.follows = "dwarffs/nixpkgs";
This states that the calling flake's 'nixpkgs' input shall be the same
as the 'nixpkgs' input of the 'dwarffs' input.
Second, you can override inputs of inputs:
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
or equivalently, using 'follows':
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
This states that the 'nixpkgs' input of the 'nixops' input shall be
the same as the calling flake's 'nixpkgs' input.
Finally, at '-v' Nix now prints the changes to the lock file, e.g.
$ nix flake update ~/Misc/eelco-configurations/hagbard
inputs of flake 'git+file:///home/eelco/Misc/eelco-configurations?subdir=hagbard' changed:
updated 'nixpkgs': 'github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9' -> 'github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd'
removed 'nixops'
removed 'nixops/nixops-aws'
removed 'nixops/nixops-hetzner'
removed 'nixops/nixpkgs'
2020-01-24 21:05:11 +00:00
|
|
|
|
|
|
|
cat > $flake3Dir/flake.nix <<EOF
|
|
|
|
{
|
|
|
|
inputs.bar.follows = "flake2/flake1";
|
|
|
|
|
|
|
|
outputs = { self, flake2, bar }: {
|
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake3Dir
|
2020-06-11 12:40:21 +00:00
|
|
|
[[ $(jq -c .nodes.root.inputs.bar $flake3Dir/flake.lock) = '["flake2","flake1"]' ]]
|
Respect lock files of inputs + fine-grained lock file control
When computing a lock file, we now respect the lock files of flake
inputs. This is important for usability / reproducibility. For
example, the 'nixops' flake depends on the 'nixops-aws' and
'nixops-hetzner' repositories. So when the 'nixops' flake is used in
another flake, we want the versions of 'nixops-aws' and
'nixops-hetzner' locked by the the 'nixops' flake because those
presumably have been tested.
This can lead to a proliferation of versions of flakes like 'nixpkgs'
(since every flake's lock file could depend on a different version of
'nixpkgs'). This is not a major issue when using Nixpkgs overlays or
NixOS modules, since then the top-level flake composes those
overlays/modules into *its* version of Nixpkgs and all other versions
are ignored. Lock file computation has been made a bit more lazy so it
won't try to fetch all those versions of 'nixpkgs'.
However, in case it's necessary to minimize flake versions, there now
are two input attributes that allow this. First, you can copy an input
from another flake, as follows:
inputs.nixpkgs.follows = "dwarffs/nixpkgs";
This states that the calling flake's 'nixpkgs' input shall be the same
as the 'nixpkgs' input of the 'dwarffs' input.
Second, you can override inputs of inputs:
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
or equivalently, using 'follows':
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
This states that the 'nixpkgs' input of the 'nixops' input shall be
the same as the calling flake's 'nixpkgs' input.
Finally, at '-v' Nix now prints the changes to the lock file, e.g.
$ nix flake update ~/Misc/eelco-configurations/hagbard
inputs of flake 'git+file:///home/eelco/Misc/eelco-configurations?subdir=hagbard' changed:
updated 'nixpkgs': 'github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9' -> 'github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd'
removed 'nixops'
removed 'nixops/nixops-aws'
removed 'nixops/nixops-hetzner'
removed 'nixops/nixpkgs'
2020-01-24 21:05:11 +00:00
|
|
|
|
|
|
|
cat > $flake3Dir/flake.nix <<EOF
|
|
|
|
{
|
|
|
|
inputs.bar.follows = "flake2";
|
|
|
|
|
|
|
|
outputs = { self, flake2, bar }: {
|
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake3Dir
|
2020-06-11 12:40:21 +00:00
|
|
|
[[ $(jq -c .nodes.root.inputs.bar $flake3Dir/flake.lock) = '["flake2"]' ]]
|
Respect lock files of inputs + fine-grained lock file control
When computing a lock file, we now respect the lock files of flake
inputs. This is important for usability / reproducibility. For
example, the 'nixops' flake depends on the 'nixops-aws' and
'nixops-hetzner' repositories. So when the 'nixops' flake is used in
another flake, we want the versions of 'nixops-aws' and
'nixops-hetzner' locked by the the 'nixops' flake because those
presumably have been tested.
This can lead to a proliferation of versions of flakes like 'nixpkgs'
(since every flake's lock file could depend on a different version of
'nixpkgs'). This is not a major issue when using Nixpkgs overlays or
NixOS modules, since then the top-level flake composes those
overlays/modules into *its* version of Nixpkgs and all other versions
are ignored. Lock file computation has been made a bit more lazy so it
won't try to fetch all those versions of 'nixpkgs'.
However, in case it's necessary to minimize flake versions, there now
are two input attributes that allow this. First, you can copy an input
from another flake, as follows:
inputs.nixpkgs.follows = "dwarffs/nixpkgs";
This states that the calling flake's 'nixpkgs' input shall be the same
as the 'nixpkgs' input of the 'dwarffs' input.
Second, you can override inputs of inputs:
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
or equivalently, using 'follows':
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
This states that the 'nixpkgs' input of the 'nixops' input shall be
the same as the calling flake's 'nixpkgs' input.
Finally, at '-v' Nix now prints the changes to the lock file, e.g.
$ nix flake update ~/Misc/eelco-configurations/hagbard
inputs of flake 'git+file:///home/eelco/Misc/eelco-configurations?subdir=hagbard' changed:
updated 'nixpkgs': 'github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9' -> 'github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd'
removed 'nixops'
removed 'nixops/nixops-aws'
removed 'nixops/nixops-hetzner'
removed 'nixops/nixpkgs'
2020-01-24 21:05:11 +00:00
|
|
|
|
|
|
|
# Test overriding inputs of inputs.
|
2022-07-13 18:36:11 +00:00
|
|
|
writeTrivialFlake $flake7Dir
|
|
|
|
git -C $flake7Dir add flake.nix
|
|
|
|
git -C $flake7Dir commit -m 'Initial'
|
|
|
|
|
Respect lock files of inputs + fine-grained lock file control
When computing a lock file, we now respect the lock files of flake
inputs. This is important for usability / reproducibility. For
example, the 'nixops' flake depends on the 'nixops-aws' and
'nixops-hetzner' repositories. So when the 'nixops' flake is used in
another flake, we want the versions of 'nixops-aws' and
'nixops-hetzner' locked by the the 'nixops' flake because those
presumably have been tested.
This can lead to a proliferation of versions of flakes like 'nixpkgs'
(since every flake's lock file could depend on a different version of
'nixpkgs'). This is not a major issue when using Nixpkgs overlays or
NixOS modules, since then the top-level flake composes those
overlays/modules into *its* version of Nixpkgs and all other versions
are ignored. Lock file computation has been made a bit more lazy so it
won't try to fetch all those versions of 'nixpkgs'.
However, in case it's necessary to minimize flake versions, there now
are two input attributes that allow this. First, you can copy an input
from another flake, as follows:
inputs.nixpkgs.follows = "dwarffs/nixpkgs";
This states that the calling flake's 'nixpkgs' input shall be the same
as the 'nixpkgs' input of the 'dwarffs' input.
Second, you can override inputs of inputs:
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
or equivalently, using 'follows':
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
This states that the 'nixpkgs' input of the 'nixops' input shall be
the same as the calling flake's 'nixpkgs' input.
Finally, at '-v' Nix now prints the changes to the lock file, e.g.
$ nix flake update ~/Misc/eelco-configurations/hagbard
inputs of flake 'git+file:///home/eelco/Misc/eelco-configurations?subdir=hagbard' changed:
updated 'nixpkgs': 'github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9' -> 'github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd'
removed 'nixops'
removed 'nixops/nixops-aws'
removed 'nixops/nixops-hetzner'
removed 'nixops/nixpkgs'
2020-01-24 21:05:11 +00:00
|
|
|
cat > $flake3Dir/flake.nix <<EOF
|
|
|
|
{
|
2020-02-02 12:06:00 +00:00
|
|
|
inputs.flake2.inputs.flake1 = {
|
|
|
|
type = "git";
|
|
|
|
url = file://$flake7Dir;
|
|
|
|
};
|
Respect lock files of inputs + fine-grained lock file control
When computing a lock file, we now respect the lock files of flake
inputs. This is important for usability / reproducibility. For
example, the 'nixops' flake depends on the 'nixops-aws' and
'nixops-hetzner' repositories. So when the 'nixops' flake is used in
another flake, we want the versions of 'nixops-aws' and
'nixops-hetzner' locked by the the 'nixops' flake because those
presumably have been tested.
This can lead to a proliferation of versions of flakes like 'nixpkgs'
(since every flake's lock file could depend on a different version of
'nixpkgs'). This is not a major issue when using Nixpkgs overlays or
NixOS modules, since then the top-level flake composes those
overlays/modules into *its* version of Nixpkgs and all other versions
are ignored. Lock file computation has been made a bit more lazy so it
won't try to fetch all those versions of 'nixpkgs'.
However, in case it's necessary to minimize flake versions, there now
are two input attributes that allow this. First, you can copy an input
from another flake, as follows:
inputs.nixpkgs.follows = "dwarffs/nixpkgs";
This states that the calling flake's 'nixpkgs' input shall be the same
as the 'nixpkgs' input of the 'dwarffs' input.
Second, you can override inputs of inputs:
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
or equivalently, using 'follows':
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
This states that the 'nixpkgs' input of the 'nixops' input shall be
the same as the calling flake's 'nixpkgs' input.
Finally, at '-v' Nix now prints the changes to the lock file, e.g.
$ nix flake update ~/Misc/eelco-configurations/hagbard
inputs of flake 'git+file:///home/eelco/Misc/eelco-configurations?subdir=hagbard' changed:
updated 'nixpkgs': 'github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9' -> 'github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd'
removed 'nixops'
removed 'nixops/nixops-aws'
removed 'nixops/nixops-hetzner'
removed 'nixops/nixpkgs'
2020-01-24 21:05:11 +00:00
|
|
|
|
|
|
|
outputs = { self, flake2 }: {
|
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake3Dir
|
2020-03-12 21:06:57 +00:00
|
|
|
[[ $(jq .nodes.flake1.locked.url $flake3Dir/flake.lock) =~ flake7 ]]
|
Respect lock files of inputs + fine-grained lock file control
When computing a lock file, we now respect the lock files of flake
inputs. This is important for usability / reproducibility. For
example, the 'nixops' flake depends on the 'nixops-aws' and
'nixops-hetzner' repositories. So when the 'nixops' flake is used in
another flake, we want the versions of 'nixops-aws' and
'nixops-hetzner' locked by the the 'nixops' flake because those
presumably have been tested.
This can lead to a proliferation of versions of flakes like 'nixpkgs'
(since every flake's lock file could depend on a different version of
'nixpkgs'). This is not a major issue when using Nixpkgs overlays or
NixOS modules, since then the top-level flake composes those
overlays/modules into *its* version of Nixpkgs and all other versions
are ignored. Lock file computation has been made a bit more lazy so it
won't try to fetch all those versions of 'nixpkgs'.
However, in case it's necessary to minimize flake versions, there now
are two input attributes that allow this. First, you can copy an input
from another flake, as follows:
inputs.nixpkgs.follows = "dwarffs/nixpkgs";
This states that the calling flake's 'nixpkgs' input shall be the same
as the 'nixpkgs' input of the 'dwarffs' input.
Second, you can override inputs of inputs:
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
or equivalently, using 'follows':
inputs.nixpkgs.url = github:edolstra/nixpkgs/<hash>;
inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
This states that the 'nixpkgs' input of the 'nixops' input shall be
the same as the calling flake's 'nixpkgs' input.
Finally, at '-v' Nix now prints the changes to the lock file, e.g.
$ nix flake update ~/Misc/eelco-configurations/hagbard
inputs of flake 'git+file:///home/eelco/Misc/eelco-configurations?subdir=hagbard' changed:
updated 'nixpkgs': 'github:edolstra/nixpkgs/7845bf5f4b3013df1cf036e9c9c3a55a30331db9' -> 'github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd'
removed 'nixops'
removed 'nixops/nixops-aws'
removed 'nixops/nixops-hetzner'
removed 'nixops/nixpkgs'
2020-01-24 21:05:11 +00:00
|
|
|
|
|
|
|
cat > $flake3Dir/flake.nix <<EOF
|
|
|
|
{
|
|
|
|
inputs.flake2.inputs.flake1.follows = "foo";
|
|
|
|
inputs.foo.url = git+file://$flake7Dir;
|
|
|
|
|
|
|
|
outputs = { self, flake2 }: {
|
|
|
|
};
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
|
2023-10-31 15:19:05 +00:00
|
|
|
nix flake update --flake "$flake3Dir"
|
|
|
|
[[ $(jq -c .nodes.flake2.inputs.flake1 "$flake3Dir/flake.lock") =~ '["foo"]' ]]
|
|
|
|
[[ $(jq .nodes.foo.locked.url "$flake3Dir/flake.lock") =~ flake7 ]]
|
2020-01-27 12:45:49 +00:00
|
|
|
|
2021-02-21 15:41:46 +00:00
|
|
|
# Test git+file with bare repo.
|
|
|
|
rm -rf $flakeGitBare
|
|
|
|
git clone --bare $flake1Dir $flakeGitBare
|
|
|
|
nix build -o $TEST_ROOT/result git+file://$flakeGitBare
|
|
|
|
|
2021-10-06 16:29:20 +00:00
|
|
|
# Test path flakes.
|
2022-07-13 12:40:39 +00:00
|
|
|
mkdir -p $flake5Dir
|
|
|
|
writeDependentFlake $flake5Dir
|
2021-10-06 16:29:20 +00:00
|
|
|
nix flake lock path://$flake5Dir
|
2020-01-28 12:11:02 +00:00
|
|
|
|
2021-10-06 16:29:20 +00:00
|
|
|
# Test tarball flakes.
|
|
|
|
tar cfz $TEST_ROOT/flake.tar.gz -C $TEST_ROOT flake5
|
2020-01-28 12:11:02 +00:00
|
|
|
|
|
|
|
nix build -o $TEST_ROOT/result file://$TEST_ROOT/flake.tar.gz
|
|
|
|
|
|
|
|
# Building with a tarball URL containing a SRI hash should also work.
|
2021-03-16 16:19:04 +00:00
|
|
|
url=$(nix flake metadata --json file://$TEST_ROOT/flake.tar.gz | jq -r .url)
|
2020-01-28 12:11:02 +00:00
|
|
|
[[ $url =~ sha256- ]]
|
|
|
|
|
|
|
|
nix build -o $TEST_ROOT/result $url
|
|
|
|
|
|
|
|
# Building with an incorrect SRI hash should fail.
|
2021-12-09 15:26:46 +00:00
|
|
|
expectStderr 102 nix build -o $TEST_ROOT/result "file://$TEST_ROOT/flake.tar.gz?narHash=sha256-qQ2Zz4DNHViCUrp6gTS7EE4+RMqFQtUfWF2UNUtJKS0=" | grep 'NAR hash mismatch'
|
2020-01-29 13:57:57 +00:00
|
|
|
|
|
|
|
# Test --override-input.
|
|
|
|
git -C $flake3Dir reset --hard
|
2021-10-06 16:29:20 +00:00
|
|
|
nix flake lock $flake3Dir --override-input flake2/flake1 file://$TEST_ROOT/flake.tar.gz -vvvvv
|
|
|
|
[[ $(jq .nodes.flake1_2.locked.url $flake3Dir/flake.lock) =~ flake.tar.gz ]]
|
2020-01-29 13:57:57 +00:00
|
|
|
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake3Dir --override-input flake2/flake1 flake1
|
2020-03-12 21:06:57 +00:00
|
|
|
[[ $(jq -r .nodes.flake1_2.locked.rev $flake3Dir/flake.lock) =~ $hash2 ]]
|
2020-01-29 13:57:57 +00:00
|
|
|
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake3Dir --override-input flake2/flake1 flake1/master/$hash1
|
2020-03-12 21:06:57 +00:00
|
|
|
[[ $(jq -r .nodes.flake1_2.locked.rev $flake3Dir/flake.lock) =~ $hash1 ]]
|
2020-01-29 22:12:58 +00:00
|
|
|
|
2021-02-26 13:55:54 +00:00
|
|
|
nix flake lock $flake3Dir
|
2020-03-12 21:06:57 +00:00
|
|
|
[[ $(jq -r .nodes.flake1_2.locked.rev $flake3Dir/flake.lock) = $hash1 ]]
|
2020-01-29 22:12:58 +00:00
|
|
|
|
2023-10-31 15:19:05 +00:00
|
|
|
# Test updating an individual input of a flake lockfile.
|
|
|
|
nix flake update flake2/flake1 --flake "$flake3Dir"
|
|
|
|
[[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]]
|
2020-01-31 11:54:52 +00:00
|
|
|
|
2024-05-31 20:21:16 +00:00
|
|
|
# Test updating multiple inputs.
|
|
|
|
nix flake lock "$flake3Dir" --override-input flake1 flake1/master/$hash1
|
|
|
|
nix flake lock "$flake3Dir" --override-input flake2/flake1 flake1/master/$hash1
|
|
|
|
[[ $(jq -r .nodes.flake1.locked.rev "$flake3Dir/flake.lock") =~ $hash1 ]]
|
|
|
|
[[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash1 ]]
|
|
|
|
|
|
|
|
nix flake update flake1 flake2/flake1 --flake "$flake3Dir"
|
|
|
|
[[ $(jq -r .nodes.flake1.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]]
|
|
|
|
[[ $(jq -r .nodes.flake1_2.locked.rev "$flake3Dir/flake.lock") =~ $hash2 ]]
|
|
|
|
|
2021-03-16 16:19:04 +00:00
|
|
|
# Test 'nix flake metadata --json'.
|
|
|
|
nix flake metadata $flake3Dir --json | jq .
|
2020-03-27 21:03:40 +00:00
|
|
|
|
2022-12-07 11:58:58 +00:00
|
|
|
# Test flake in store does not evaluate.
|
2021-09-02 12:01:07 +00:00
|
|
|
rm -rf $badFlakeDir
|
2021-02-22 20:05:37 +00:00
|
|
|
mkdir $badFlakeDir
|
|
|
|
echo INVALID > $badFlakeDir/flake.nix
|
|
|
|
nix store delete $(nix store add-path $badFlakeDir)
|
2021-09-02 12:01:07 +00:00
|
|
|
|
|
|
|
[[ $(nix path-info $(nix store add-path $flake1Dir)) =~ flake1 ]]
|
|
|
|
[[ $(nix path-info path:$(nix store add-path $flake1Dir)) =~ simple ]]
|
2022-12-07 14:23:01 +00:00
|
|
|
|
|
|
|
# Test fetching flakerefs in the legacy CLI.
|
|
|
|
[[ $(nix-instantiate --eval flake:flake3 -A x) = 123 ]]
|
|
|
|
[[ $(nix-instantiate --eval flake:git+file://$flake3Dir -A x) = 123 ]]
|
|
|
|
[[ $(nix-instantiate -I flake3=flake:flake3 --eval '<flake3>' -A x) = 123 ]]
|
|
|
|
[[ $(NIX_PATH=flake3=flake:flake3 nix-instantiate --eval '<flake3>' -A x) = 123 ]]
|
2023-03-19 13:11:19 +00:00
|
|
|
|
|
|
|
# Test alternate lockfile paths.
|
2023-03-19 13:14:30 +00:00
|
|
|
nix flake lock $flake2Dir --output-lock-file $TEST_ROOT/flake2.lock
|
|
|
|
cmp $flake2Dir/flake.lock $TEST_ROOT/flake2.lock >/dev/null # lockfiles should be identical, since we're referencing flake2's original one
|
2023-03-19 13:11:19 +00:00
|
|
|
|
2023-03-19 13:14:30 +00:00
|
|
|
nix flake lock $flake2Dir --output-lock-file $TEST_ROOT/flake2-overridden.lock --override-input flake1 git+file://$flake1Dir?rev=$flake1OriginalCommit
|
|
|
|
expectStderr 1 cmp $flake2Dir/flake.lock $TEST_ROOT/flake2-overridden.lock
|
|
|
|
nix flake metadata $flake2Dir --reference-lock-file $TEST_ROOT/flake2-overridden.lock | grepQuiet $flake1OriginalCommit
|
2023-03-19 13:11:19 +00:00
|
|
|
|
|
|
|
# reference-lock-file can only be used if allow-dirty is set.
|
2023-03-19 13:14:30 +00:00
|
|
|
expectStderr 1 nix flake metadata $flake2Dir --no-allow-dirty --reference-lock-file $TEST_ROOT/flake2-overridden.lock
|