Merge remote-tracking branch 'detsys-priv/detsys-main' into sync-2.24.2

tests/functional/common/init.sh

@@ -12,7 +12,6 @@ if isTestOnNixOS; then
   ! test -e "$test_nix_conf"
   cat > "$test_nix_conf_dir/nix.conf" <<EOF
 # TODO: this is not needed for all tests and prevents stable commands from be tested in isolation
-experimental-features = nix-command
 flake-registry = $TEST_ROOT/registry.json
 show-trace = true
 EOF
@@ -47,7 +46,7 @@ cat > "$NIX_CONF_DIR"/nix.conf <<EOF
 build-users-group =
 keep-derivations = false
 sandbox = false
-experimental-features = nix-command
+experimental-features =
 gc-reserved-space = 0
 substituters =
 flake-registry = $TEST_ROOT/registry.json

tests/functional/common/vars-and-functions.sh

@@ -123,7 +123,8 @@ startDaemon() {
     fi
     # Start the daemon, wait for the socket to appear.
     rm -f $NIX_DAEMON_SOCKET_PATH
-    PATH=$DAEMON_PATH nix --extra-experimental-features 'nix-command' daemon &
+    # TODO: remove the nix-command feature when we're no longer testing against old daemons.
+    PATH=$DAEMON_PATH nix daemon --extra-experimental-features nix-command &
     _NIX_TEST_DAEMON_PID=$!
     export _NIX_TEST_DAEMON_PID
     for ((i = 0; i < 300; i++)); do