aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-03-04 06:22:47 +0100
committereldritch horrors <pennae@lix.systems>2024-03-04 07:11:25 +0100
commit4018fcb9b8d622e7bac1310a689c90dac9109137 (patch)
treea1f1571a076242962b07449234b71b4c1e7c12d8 /tests
parenta2d5e803cf16e048f30f0334114759f81f6c5d20 (diff)
Merge pull request #9233 from bouk/bouk/apply-config-inner
config: add included files into parsedContents before applying (cherry picked from commit 82359eba6b692691ef08a71196ef25a61bc4d3d3) Change-Id: Idde3177010fec7b8bafe6088c3c23d5caf491845
Diffstat (limited to 'tests')
-rwxr-xr-xtests/functional/init.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/functional/init.sh b/tests/functional/init.sh
index c420e8c9f..d697b1a30 100755
--- a/tests/functional/init.sh
+++ b/tests/functional/init.sh
@@ -20,7 +20,7 @@ cat > "$NIX_CONF_DIR"/nix.conf <<EOF
build-users-group =
keep-derivations = false
sandbox = false
-experimental-features = nix-command flakes
+experimental-features = nix-command
gc-reserved-space = 0
substituters =
flake-registry = $TEST_ROOT/registry.json
@@ -31,6 +31,7 @@ EOF
cat > "$NIX_CONF_DIR"/nix.conf.extra <<EOF
fsync-metadata = false
+extra-experimental-features = flakes
!include nix.conf.extra.not-there
EOF