From 1b52a3add1d79633c2feb0ff206c096617962053 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 10 Jul 2024 18:45:23 +0200
Subject: [PATCH] Remove references to nix-command

---
 doc/manual/local.mk                           |  4 ++--
 scripts/installer.nix                         |  2 +-
 src/libutil/config.hh                         |  2 +-
 tests/functional/ca/derivation-json.sh        |  2 +-
 tests/functional/ca/selfref-gc.sh             |  2 +-
 tests/functional/common/init.sh               |  3 +--
 tests/functional/common/vars-and-functions.sh |  2 +-
 tests/functional/config.sh                    |  2 +-
 tests/functional/config/nix-with-include.conf |  1 -
 .../config/nix-with-substituters.conf         |  1 -
 tests/functional/dyn-drv/eval-outputOf.sh     |  6 ++---
 .../functional/dyn-drv/recursive-mod-json.nix |  2 +-
 tests/functional/experimental-features.sh     | 24 +++++++++----------
 tests/functional/impure-derivations.sh        |  2 +-
 tests/functional/recursive.nix                |  2 +-
 tests/functional/recursive.sh                 |  2 +-
 tests/installer/default.nix                   |  2 +-
 tests/nixos/authorization.nix                 |  2 --
 tests/nixos/containers/containers.nix         |  2 +-
 tests/nixos/fetch-git/testsupport/setup.nix   |  1 -
 tests/nixos/git-submodules.nix                |  1 -
 tests/nixos/github-flakes.nix                 |  1 -
 tests/nixos/nix-copy.nix                      |  1 -
 tests/nixos/sourcehut-flakes.nix              |  1 -
 tests/nixos/tarball-flakes.nix                |  1 -
 tests/repl-completion.nix                     |  4 ++--
 26 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 0cec52885..d4cba066b 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -35,7 +35,7 @@ dummy-env = env -i \
 	NIX_STATE_DIR=/dummy \
 	NIX_CONFIG='cores = 0'
 
-nix-eval = $(dummy-env) $(doc_nix) eval --experimental-features nix-command -I nix=doc/manual --store dummy:// --impure --raw
+nix-eval = $(dummy-env) $(doc_nix) eval -I nix=doc/manual --store dummy:// --impure --raw
 
 # re-implement mdBook's include directive to make it usable for terminal output and for proper @docroot@ substitution
 define process-includes
@@ -121,7 +121,7 @@ $(d)/nix.json: $(doc_nix)
 	@mv $@.tmp $@
 
 $(d)/conf-file.json: $(doc_nix)
-	$(trace-gen) $(dummy-env) $(doc_nix) config show --json --experimental-features nix-command > $@.tmp
+	$(trace-gen) $(dummy-env) $(doc_nix) config show --json > $@.tmp
 	@mv $@.tmp $@
 
 $(d)/src/contributing/experimental-feature-descriptions.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(doc_nix)
diff --git a/scripts/installer.nix b/scripts/installer.nix
index cc7759c2c..3d51d4916 100644
--- a/scripts/installer.nix
+++ b/scripts/installer.nix
@@ -25,7 +25,7 @@ runCommand "installer-script" {
       (tarball: let
           inherit (tarball.stdenv.hostPlatform) system;
         in '' \
-        --replace '@tarballHash_${system}@' $(nix --experimental-features nix-command hash-file --base16 --type sha256 ${tarball}/*.tar.xz) \
+        --replace '@tarballHash_${system}@' $(nix hash-file --base16 --type sha256 ${tarball}/*.tar.xz) \
         --replace '@tarballPath_${system}@' $(tarballPath ${tarball}/*.tar.xz) \
         ''
       )
diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index a30d1b1ec..f1c7233ba 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -386,7 +386,7 @@ struct ExperimentalFeatureSettings : Config {
           Example:
 
           ```
-          experimental-features = nix-command
+          experimental-features = ca-derivations
           ```
 
           The following experimental features are available:
diff --git a/tests/functional/ca/derivation-json.sh b/tests/functional/ca/derivation-json.sh
index 1e2a8fe35..97f165732 100644
--- a/tests/functional/ca/derivation-json.sh
+++ b/tests/functional/ca/derivation-json.sh
@@ -19,7 +19,7 @@ drvPath3=$(nix derivation add --dry-run < "$TEST_HOME"/foo.json)
 [[ ! -e "$drvPath3" ]]
 
 # But the JSON is rejected without the experimental feature
-expectStderr 1 nix derivation add < "$TEST_HOME"/foo.json --experimental-features nix-command | grepQuiet "experimental Nix feature 'ca-derivations' is disabled"
+expectStderr 1 nix derivation add < "$TEST_HOME"/foo.json --experimental-features '' | grepQuiet "experimental Nix feature 'ca-derivations' is disabled"
 
 # Without --dry-run it is actually written
 drvPath4=$(nix derivation add < "$TEST_HOME"/foo.json)
diff --git a/tests/functional/ca/selfref-gc.sh b/tests/functional/ca/selfref-gc.sh
index 588515db5..a730bdab6 100755
--- a/tests/functional/ca/selfref-gc.sh
+++ b/tests/functional/ca/selfref-gc.sh
@@ -4,7 +4,7 @@ source common.sh
 
 requireDaemonNewerThan "2.4pre20210626"
 
-enableFeatures "ca-derivations nix-command"
+enableFeatures "ca-derivations"
 
 export NIX_TESTS_CA_BY_DEFAULT=1
 cd ..
diff --git a/tests/functional/common/init.sh b/tests/functional/common/init.sh
index 482d62cc4..38b29d122 100755
--- a/tests/functional/common/init.sh
+++ b/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
diff --git a/tests/functional/common/vars-and-functions.sh b/tests/functional/common/vars-and-functions.sh
index 4a55da515..a1f51dc88 100644
--- a/tests/functional/common/vars-and-functions.sh
+++ b/tests/functional/common/vars-and-functions.sh
@@ -123,7 +123,7 @@ 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 &
+    PATH=$DAEMON_PATH nix daemon &
     _NIX_TEST_DAEMON_PID=$!
     export _NIX_TEST_DAEMON_PID
     for ((i = 0; i < 300; i++)); do
diff --git a/tests/functional/config.sh b/tests/functional/config.sh
index a1016a368..363120016 100755
--- a/tests/functional/config.sh
+++ b/tests/functional/config.sh
@@ -59,7 +59,7 @@ var=$(nix config show | grep '^fsync-metadata =' | cut -d '=' -f 2 | xargs)
 
 # Test that it's possible to load config from the environment
 prev=$(nix config show | grep '^cores' | cut -d '=' -f 2 | xargs)
-export NIX_CONFIG="cores = 4242"$'\n'"experimental-features = nix-command"
+export NIX_CONFIG="cores = 4242"$'\n'
 exp_cores=$(nix config show | grep '^cores' | cut -d '=' -f 2 | xargs)
 exp_features=$(nix config show | grep '^experimental-features' | cut -d '=' -f 2 | xargs)
 [[ $prev != $exp_cores ]]
diff --git a/tests/functional/config/nix-with-include.conf b/tests/functional/config/nix-with-include.conf
index 17b8958ba..d8a68d3cf 100644
--- a/tests/functional/config/nix-with-include.conf
+++ b/tests/functional/config/nix-with-include.conf
@@ -1,2 +1 @@
-experimental-features = nix-command
 include ./extra-config.conf
\ No newline at end of file
diff --git a/tests/functional/config/nix-with-substituters.conf b/tests/functional/config/nix-with-substituters.conf
index 90f359a6f..b7a6351be 100644
--- a/tests/functional/config/nix-with-substituters.conf
+++ b/tests/functional/config/nix-with-substituters.conf
@@ -1,2 +1 @@
-experimental-features = nix-command
 substituters = https://example.com
diff --git a/tests/functional/dyn-drv/eval-outputOf.sh b/tests/functional/dyn-drv/eval-outputOf.sh
index 3681bd098..82aa04ca2 100644
--- a/tests/functional/dyn-drv/eval-outputOf.sh
+++ b/tests/functional/dyn-drv/eval-outputOf.sh
@@ -3,7 +3,7 @@
 source ./common.sh
 
 # Without the dynamic-derivations XP feature, we don't have the builtin.
-nix --experimental-features 'nix-command' eval --impure  --expr \
+nix --experimental-features '' eval --impure  --expr \
     'assert ! (builtins ? outputOf); ""'
 
 # Test that a string is required.
@@ -12,14 +12,14 @@ nix --experimental-features 'nix-command' eval --impure  --expr \
 # object that could be coerced to a string. We might liberalise this in
 # the future so it does work, but there are some design questions to
 # resolve first. Adding a test so we don't liberalise it by accident.
-expectStderr 1 nix --experimental-features 'nix-command dynamic-derivations' eval --impure --expr \
+expectStderr 1 nix --experimental-features 'dynamic-derivations' eval --impure --expr \
     'builtins.outputOf (import ../dependencies.nix {}) "out"' \
     | grepQuiet "expected a string but found a set"
 
 # Test that "DrvDeep" string contexts are not supported at this time
 #
 # Like the above, this is a restriction we could relax later.
-expectStderr 1 nix --experimental-features 'nix-command dynamic-derivations' eval --impure --expr \
+expectStderr 1 nix --experimental-features 'dynamic-derivations' eval --impure --expr \
     'builtins.outputOf (import ../dependencies.nix {}).drvPath "out"' \
     | grepQuiet "has a context which refers to a complete source and binary closure. This is not supported at this time"
 
diff --git a/tests/functional/dyn-drv/recursive-mod-json.nix b/tests/functional/dyn-drv/recursive-mod-json.nix
index c6a24ca4f..842f784ae 100644
--- a/tests/functional/dyn-drv/recursive-mod-json.nix
+++ b/tests/functional/dyn-drv/recursive-mod-json.nix
@@ -11,7 +11,7 @@ mkDerivation rec {
   drv = builtins.unsafeDiscardOutputDependency (import ./text-hashed-output.nix).hello.drvPath;
 
   buildCommand = ''
-    export NIX_CONFIG='experimental-features = nix-command ca-derivations'
+    export NIX_CONFIG='experimental-features = ca-derivations'
 
     PATH=${builtins.getEnv "EXTRA_PATH"}:$PATH
 
diff --git a/tests/functional/experimental-features.sh b/tests/functional/experimental-features.sh
index 0533a7c04..43514e229 100755
--- a/tests/functional/experimental-features.sh
+++ b/tests/functional/experimental-features.sh
@@ -11,12 +11,12 @@ source common.sh
 # # With flakes, flake options should show up
 #
 # function grep_both_ways {
-#     nix --experimental-features 'nix-command' "$@" | grepQuietInverse flake
-#     nix --experimental-features 'nix-command' "$@" | grepQuiet flake
+#     nix --experimental-features '' "$@" | grepQuietInverse flake
+#     nix --experimental-features '' "$@" | grepQuiet flake
 #
 #     # Also, the order should not matter
-#     nix "$@" --experimental-features 'nix-command' | grepQuietInverse flake
-#     nix "$@" --experimental-features 'nix-command' | grepQuiet flake
+#     nix "$@" --experimental-features '' | grepQuietInverse flake
+#     nix "$@" --experimental-features '' | grepQuiet flake
 # }
 #
 # # Simple case, the configuration effects the running command
@@ -34,7 +34,7 @@ gatedSetting=auto-allocate-uids
 
 # Experimental feature is disabled before, ignore and warn.
 NIX_CONFIG="
-  experimental-features = nix-command
+  experimental-features =
   $gatedSetting = true
 " expect 1 nix config show $gatedSetting 1>"$TEST_ROOT"/stdout 2>"$TEST_ROOT"/stderr
 [[ $(cat "$TEST_ROOT/stdout") = '' ]]
@@ -43,14 +43,14 @@ grepQuiet "error: could not find setting '$gatedSetting'" "$TEST_ROOT/stderr"
 # Experimental feature is disabled after, ignore and warn.
 NIX_CONFIG="
   $gatedSetting = true
-  experimental-features = nix-command
+  experimental-features =
 " expect 1 nix config show $gatedSetting 1>"$TEST_ROOT"/stdout 2>"$TEST_ROOT"/stderr
 [[ $(cat "$TEST_ROOT/stdout") = '' ]]
 grepQuiet "error: could not find setting '$gatedSetting'" "$TEST_ROOT/stderr"
 
 # Experimental feature is enabled before, process.
 NIX_CONFIG="
-  experimental-features = nix-command $xpFeature
+  experimental-features = $xpFeature
   $gatedSetting = true
 " nix config show $gatedSetting 1>"$TEST_ROOT"/stdout 2>"$TEST_ROOT"/stderr
 grepQuiet "true" "$TEST_ROOT/stdout"
@@ -58,18 +58,18 @@ grepQuiet "true" "$TEST_ROOT/stdout"
 # Experimental feature is enabled after, process.
 NIX_CONFIG="
   $gatedSetting = true
-  experimental-features = nix-command $xpFeature
+  experimental-features = $xpFeature
 " nix config show $gatedSetting 1>"$TEST_ROOT"/stdout 2>"$TEST_ROOT"/stderr
 grepQuiet "true" "$TEST_ROOT/stdout"
 grepQuietInverse "Ignoring setting '$gatedSetting'" "$TEST_ROOT/stderr"
 
 function exit_code_both_ways {
-    expect 1 nix --experimental-features 'nix-command ' "$@" 1>/dev/null
-    nix --experimental-features "nix-command $xpFeature" "$@" 1>/dev/null
+    expect 1 nix --experimental-features '' "$@" 1>/dev/null
+    nix --experimental-features "$xpFeature" "$@" 1>/dev/null
 
     # Also, the order should not matter
-    expect 1 nix "$@" --experimental-features 'nix-command' 1>/dev/null
-    nix "$@" --experimental-features "nix-command $xpFeature" 1>/dev/null
+    expect 1 nix "$@" --experimental-features '' 1>/dev/null
+    nix "$@" --experimental-features "$xpFeature" 1>/dev/null
 }
 
 exit_code_both_ways config show --auto-allocate-uids
diff --git a/tests/functional/impure-derivations.sh b/tests/functional/impure-derivations.sh
index 5dea220fe..69884c293 100755
--- a/tests/functional/impure-derivations.sh
+++ b/tests/functional/impure-derivations.sh
@@ -21,7 +21,7 @@ drvPath2=$(nix derivation add < $TEST_HOME/impure-drv.json)
 [[ "$drvPath" = "$drvPath2" ]]
 
 # But only with the experimental feature!
-expectStderr 1 nix derivation add < $TEST_HOME/impure-drv.json --experimental-features nix-command | grepQuiet "experimental Nix feature 'impure-derivations' is disabled"
+expectStderr 1 nix derivation add < $TEST_HOME/impure-drv.json --experimental-features '' | grepQuiet "experimental Nix feature 'impure-derivations' is disabled"
 
 nix build --dry-run --json --file ./impure-derivations.nix impure.all
 json=$(nix build -L --no-link --json --file ./impure-derivations.nix impure.all)
diff --git a/tests/functional/recursive.nix b/tests/functional/recursive.nix
index fa8cc04db..622049dca 100644
--- a/tests/functional/recursive.nix
+++ b/tests/functional/recursive.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
 
   buildCommand = ''
     mkdir $out
-    opts="--experimental-features nix-command ${if (NIX_TESTS_CA_BY_DEFAULT == "1") then "--extra-experimental-features ca-derivations" else ""}"
+    opts="${if (NIX_TESTS_CA_BY_DEFAULT == "1") then "--extra-experimental-features ca-derivations" else ""}"
 
     PATH=${builtins.getEnv "NIX_BIN_DIR"}:$PATH
 
diff --git a/tests/functional/recursive.sh b/tests/functional/recursive.sh
index 640fb92d2..fb0aa6975 100755
--- a/tests/functional/recursive.sh
+++ b/tests/functional/recursive.sh
@@ -13,7 +13,7 @@ rm -f $TEST_ROOT/result
 
 export unreachable=$(nix store add-path ./recursive.sh)
 
-NIX_BIN_DIR=$(dirname $(type -p nix)) nix --extra-experimental-features 'nix-command recursive-nix' build -o $TEST_ROOT/result -L --impure --file ./recursive.nix
+NIX_BIN_DIR=$(dirname $(type -p nix)) nix --extra-experimental-features 'recursive-nix' build -o $TEST_ROOT/result -L --impure --file ./recursive.nix
 
 [[ $(cat $TEST_ROOT/result/inner1) =~ blaat ]]
 
diff --git a/tests/installer/default.nix b/tests/installer/default.nix
index 4aed6eae4..3b75c5e0f 100644
--- a/tests/installer/default.nix
+++ b/tests/installer/default.nix
@@ -224,7 +224,7 @@ let
           source /etc/bashrc || true
 
           nix-env --version
-          nix --extra-experimental-features nix-command store info
+          nix store info
 
           out=\$(nix-build --no-substitute -E 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/bin/sh"; args = ["-c" "echo foobar > \$out"]; }')
           [[ \$(cat \$out) = foobar ]]
diff --git a/tests/nixos/authorization.nix b/tests/nixos/authorization.nix
index fdeae06ed..d80069e77 100644
--- a/tests/nixos/authorization.nix
+++ b/tests/nixos/authorization.nix
@@ -10,8 +10,6 @@
     users.users.alice.isNormalUser = true;
     users.users.bob.isNormalUser = true;
     users.users.mallory.isNormalUser = true;
-
-    nix.settings.experimental-features = "nix-command";
   };
 
   testScript =
diff --git a/tests/nixos/containers/containers.nix b/tests/nixos/containers/containers.nix
index 6773f5628..188012c9b 100644
--- a/tests/nixos/containers/containers.nix
+++ b/tests/nixos/containers/containers.nix
@@ -18,7 +18,7 @@
           nix.settings.substituters = lib.mkForce [ ];
           nix.extraOptions =
             ''
-              extra-experimental-features = nix-command auto-allocate-uids cgroups
+              extra-experimental-features = auto-allocate-uids cgroups
               extra-system-features = uid-range
             '';
           nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
diff --git a/tests/nixos/fetch-git/testsupport/setup.nix b/tests/nixos/fetch-git/testsupport/setup.nix
index a81d5614b..08195daa5 100644
--- a/tests/nixos/fetch-git/testsupport/setup.nix
+++ b/tests/nixos/fetch-git/testsupport/setup.nix
@@ -74,7 +74,6 @@ in
       environment.variables = {
         _NIX_FORCE_HTTP = "1";
       };
-      nix.settings.experimental-features = ["nix-command" "flakes"];
     };
     setupScript = ''
     '';
diff --git a/tests/nixos/git-submodules.nix b/tests/nixos/git-submodules.nix
index 570b1822b..6bcb75b5e 100644
--- a/tests/nixos/git-submodules.nix
+++ b/tests/nixos/git-submodules.nix
@@ -20,7 +20,6 @@
           {
             programs.ssh.extraConfig = "ConnectTimeout 30";
             environment.systemPackages = [ pkgs.git ];
-            nix.extraOptions = "experimental-features = nix-command flakes";
           };
       };
 
diff --git a/tests/nixos/github-flakes.nix b/tests/nixos/github-flakes.nix
index 9a1ed749c..37ffa2b70 100644
--- a/tests/nixos/github-flakes.nix
+++ b/tests/nixos/github-flakes.nix
@@ -143,7 +143,6 @@ in
           virtualisation.additionalPaths = [ pkgs.hello pkgs.fuse ];
           virtualisation.memorySize = 4096;
           nix.settings.substituters = lib.mkForce [ ];
-          nix.extraOptions = "experimental-features = nix-command";
           networking.hosts.${(builtins.head nodes.github.networking.interfaces.eth1.ipv4.addresses).address} =
             [ "channels.nixos.org" "api.github.com" "github.com" ];
           security.pki.certificateFiles = [ "${cert}/ca.crt" ];
diff --git a/tests/nixos/nix-copy.nix b/tests/nixos/nix-copy.nix
index 7db5197aa..cd0cca63b 100644
--- a/tests/nixos/nix-copy.nix
+++ b/tests/nixos/nix-copy.nix
@@ -23,7 +23,6 @@ in {
         { virtualisation.writableStore = true;
           virtualisation.additionalPaths = [ pkgA pkgD.drvPath ];
           nix.settings.substituters = lib.mkForce [ ];
-          nix.settings.experimental-features = [ "nix-command" ];
           services.getty.autologinUser = "root";
           programs.ssh.extraConfig = ''
             Host *
diff --git a/tests/nixos/sourcehut-flakes.nix b/tests/nixos/sourcehut-flakes.nix
index 4eeab42db..a1422ab96 100644
--- a/tests/nixos/sourcehut-flakes.nix
+++ b/tests/nixos/sourcehut-flakes.nix
@@ -104,7 +104,6 @@ in
             virtualisation.memorySize = 4096;
             nix.settings.substituters = lib.mkForce [ ];
             nix.extraOptions = ''
-              experimental-features = nix-command
               flake-registry = https://git.sr.ht/~NixOS/flake-registry/blob/master/flake-registry.json
             '';
             environment.systemPackages = [ pkgs.jq ];
diff --git a/tests/nixos/tarball-flakes.nix b/tests/nixos/tarball-flakes.nix
index 2a21d8738..e0327cac5 100644
--- a/tests/nixos/tarball-flakes.nix
+++ b/tests/nixos/tarball-flakes.nix
@@ -51,7 +51,6 @@ in
           virtualisation.additionalPaths = [ pkgs.hello pkgs.fuse ];
           virtualisation.memorySize = 4096;
           nix.settings.substituters = lib.mkForce [ ];
-          nix.extraOptions = "experimental-features = nix-command";
         };
     };
 
diff --git a/tests/repl-completion.nix b/tests/repl-completion.nix
index 3ba198a98..5cca0fc1c 100644
--- a/tests/repl-completion.nix
+++ b/tests/repl-completion.nix
@@ -10,7 +10,7 @@ runCommand "repl-completion" {
   ];
   expectScript = ''
     # Regression https://github.com/NixOS/nix/pull/10778
-    spawn nix repl --offline --extra-experimental-features nix-command
+    spawn nix repl --offline
     expect "nix-repl>"
     send "foo = import ./does-not-exist.nix\n"
     expect "nix-repl>"
@@ -37,4 +37,4 @@ runCommand "repl-completion" {
   nix-store --init
   expect $expectScriptPath
   touch $out
-''
\ No newline at end of file
+''