From 8d6c1684fcb0e736b027cfaa96b27c25d1e19f93 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@tweag.io>
Date: Mon, 30 Sep 2024 20:13:28 +0200
Subject: [PATCH] Revert "Rename 'nix derivation instantiate' to 'nix
 instantiate'"

This reverts commit fab406619dfccce91184785cab9e1f18b65ab368.
---
 src/nix/derivation-instantiate.cc          |  6 +++---
 src/nix/derivation-instantiate.md          |  8 ++++----
 tests/functional/derivation-instantiate.sh | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/nix/derivation-instantiate.cc b/src/nix/derivation-instantiate.cc
index 1807563be091..ad1a2022607a 100644
--- a/src/nix/derivation-instantiate.cc
+++ b/src/nix/derivation-instantiate.cc
@@ -32,12 +32,12 @@ createOutLinks(const std::filesystem::path & outLink, const StorePathSet & deriv
     }
 }
 
-struct CmdInstantiate : InstallablesCommand, MixJSON
+struct CmdInstantiateDerivation : InstallablesCommand, MixJSON
 {
     Path outLink = "drv";
     bool printOutputPaths = false;
 
-    CmdInstantiate()
+    CmdInstantiateDerivation()
     {
         addFlag(
             {.longName = "out-link",
@@ -90,4 +90,4 @@ struct CmdInstantiate : InstallablesCommand, MixJSON
     }
 };
 
-static auto rCmdInstantiate = registerCommand<CmdInstantiate>({"instantiate"});
+static auto rCmdInstantiateDerivation = registerCommand2<CmdInstantiateDerivation>({"derivation", "instantiate"});
diff --git a/src/nix/derivation-instantiate.md b/src/nix/derivation-instantiate.md
index 0dc8838c43ca..8470e06f8cbc 100644
--- a/src/nix/derivation-instantiate.md
+++ b/src/nix/derivation-instantiate.md
@@ -2,11 +2,11 @@ R""(
 
 # Name
 
-`nix instantiate` - instantiate store derivations
+`nix derivation instantiate` - instantiate store derivations
 
 # Synopsis
 
-`nix instantiate`
+`nix derivation instantiate`
   [`--out-link` *link prefix*]
   [`--json`]
   [`--no-link`]
@@ -14,7 +14,7 @@ R""(
 
 # Description
 
-The command `nix instantiate` produces [store derivation]s from
+The command `nix derivation instantiate` produces [store derivation]s from
 installables. Each top-level expression should evaluate to a derivation, a list
 of derivations, or a set of derivations. The paths of the resulting store
 derivations are printed on standard output.
@@ -33,7 +33,7 @@ derivations are printed on standard output.
 
 - `--json`
 
-  Dump a JSON object whose keys are the generated store derivations instead of
+  Dump a JSON object whose keys are the generated store derivations instread of
   printing them directly on the output.
 
 )""
diff --git a/tests/functional/derivation-instantiate.sh b/tests/functional/derivation-instantiate.sh
index 243e3f3896c2..b46b177bc754 100755
--- a/tests/functional/derivation-instantiate.sh
+++ b/tests/functional/derivation-instantiate.sh
@@ -6,12 +6,12 @@ TODO_NixOS
 
 clearStore
 
-drvPath=$(nix instantiate --no-link --file simple.nix)
+drvPath=$(nix derivation instantiate --no-link --file simple.nix)
 test -f "$drvPath"
 nix-store --delete "$drvPath"
 if test -f "$drvPath"; then false; fi
 
-drvPath=$(nix instantiate --file simple.nix)
+drvPath=$(nix derivation instantiate --file simple.nix)
 test -f "$drvPath"
 test -e drv
 nix-store --gc --print-roots | grep "$drvPath"
@@ -23,17 +23,17 @@ rm drv
 nix-store --delete "$drvPath"
 if test -f "$drvPath"; then false; fi
 
-drvPath=$(nix instantiate --out-link foobar --file simple.nix)
+drvPath=$(nix derivation instantiate --out-link foobar --file simple.nix)
 test -e foobar
 [ "$(nix-store -q --roots "$drvPath")" = "$(realpath --no-symlinks foobar) -> $drvPath" ]
 rm foobar
 nix-store --delete "$drvPath"
 
-drvPathJson=$(nix instantiate --json --no-link --file simple.nix)
+drvPathJson=$(nix derivation instantiate --json --no-link --file simple.nix)
 [ "$drvPathJson" = "{\"$drvPath\":{}}" ]
 nix-store --delete "$drvPath"
 
-mapfile -t drvPaths < <(nix instantiate --json --out-link multidrv --file check.nix | jq 'keys|.[]' -r)
+mapfile -t drvPaths < <(nix derivation instantiate --json --out-link multidrv --file check.nix | jq 'keys|.[]' -r)
 roots=(./multidrv*)
 [ "${#roots[@]}" -gt 1 ]
 [ "${#roots[@]}" -eq "${#drvPaths[@]}" ]