Get rid of the --derivation flag

Since PR NixOS#7601, we've had enough flexibility in our types of installables that it is no longer needed. Progress towards NixOS#7261
obsidiansystems · Jun 27, 2023 · 4f712fe · 4f712fe
1 parent 559fd7f
commit 4f712fe
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 67 deletions.
diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc
@@ -130,16 +130,6 @@ ref<EvalState> EvalCommand::getEvalState()
     return ref<EvalState>(evalState);
 }
 
-MixOperateOnOptions::MixOperateOnOptions()
-{
-    addFlag({
-        .longName = "derivation",
-        .description = "Operate on the [store derivation](../../glossary.md#gloss-store-derivation) rather than its outputs.",
-        .category = installablesCategory,
-        .handler = {&operateOn, OperateOn::Derivation},
-    });
-}
-
 BuiltPathsCommand::BuiltPathsCommand(bool recursive)
     : recursive(recursive)
 {
@@ -177,7 +167,7 @@ void BuiltPathsCommand::run(ref<Store> store, Installables && installables)
         for (auto & p : store->queryAllValidPaths())
             paths.push_back(BuiltPath::Opaque{p});
     } else {
-        paths = Installable::toBuiltPaths(getEvalStore(), store, realiseMode, operateOn, installables);
+        paths = Installable::toBuiltPaths(getEvalStore(), store, realiseMode, installables);
         if (recursive) {
             // XXX: This only computes the store path closure, ignoring
             // intermediate realisations

diff --git a/src/libcmd/command.hh b/src/libcmd/command.hh
@@ -168,15 +168,8 @@ private:
     std::string _installable{"."};
 };
 
-struct MixOperateOnOptions : virtual Args
-{
-    OperateOn operateOn = OperateOn::Output;
-
-    MixOperateOnOptions();
-};
-
 /* A command that operates on zero or more store paths. */
-struct BuiltPathsCommand : InstallablesCommand, virtual MixOperateOnOptions
+struct BuiltPathsCommand : InstallablesCommand
 {
 private:
 

diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
@@ -624,33 +624,22 @@ BuiltPaths Installable::toBuiltPaths(
     ref<Store> evalStore,
     ref<Store> store,
     Realise mode,
-    OperateOn operateOn,
     const Installables & installables)
 {
-    if (operateOn == OperateOn::Output) {
-        BuiltPaths res;
-        for (auto & p : Installable::build(evalStore, store, mode, installables))
-            res.push_back(p.path);
-        return res;
-    } else {
-        if (mode == Realise::Nothing)
-            settings.readOnlyMode = true;
-
-        BuiltPaths res;
-        for (auto & drvPath : Installable::toDerivations(store, installables, true))
-            res.push_back(BuiltPath::Opaque{drvPath});
-        return res;
-    }
+    BuiltPaths res;
+    for (auto & p : Installable::build(evalStore, store, mode, installables))
+        res.push_back(p.path);
+    return res;
 }
 
 StorePathSet Installable::toStorePaths(
     ref<Store> evalStore,
     ref<Store> store,
-    Realise mode, OperateOn operateOn,
+    Realise mode,
     const Installables & installables)
 {
     StorePathSet outPaths;
-    for (auto & path : toBuiltPaths(evalStore, store, mode, operateOn, installables)) {
+    for (auto & path : toBuiltPaths(evalStore, store, mode, installables)) {
         auto thisOutPaths = path.outPaths();
         outPaths.insert(thisOutPaths.begin(), thisOutPaths.end());
     }
@@ -660,10 +649,10 @@ StorePathSet Installable::toStorePaths(
 StorePath Installable::toStorePath(
     ref<Store> evalStore,
     ref<Store> store,
-    Realise mode, OperateOn operateOn,
+    Realise mode,
     ref<Installable> installable)
 {
-    auto paths = toStorePaths(evalStore, store, mode, operateOn, {installable});
+    auto paths = toStorePaths(evalStore, store, mode, {installable});
 
     if (paths.size() != 1)
         throw Error("argument '%s' should evaluate to one store path", installable->what());

diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh
@@ -38,20 +38,6 @@ enum class Realise {
     Nothing
 };
 
-/**
- * How to handle derivations in commands that operate on store paths.
- */
-enum class OperateOn {
-    /**
-     * Operate on the output path.
-     */
-    Output,
-    /**
-     * Operate on the .drv path.
-     */
-    Derivation
-};
-
 /**
  * Extra info about a DerivedPath
  *
@@ -169,14 +155,12 @@ struct Installable
         ref<Store> evalStore,
         ref<Store> store,
         Realise mode,
-        OperateOn operateOn,
         const Installables & installables);
 
     static StorePath toStorePath(
         ref<Store> evalStore,
         ref<Store> store,
         Realise mode,
-        OperateOn operateOn,
         ref<Installable> installable);
 
     static std::set<StorePath> toDerivations(
@@ -188,7 +172,6 @@ struct Installable
         ref<Store> evalStore,
         ref<Store> store,
         Realise mode,
-        OperateOn operateOn,
         const Installables & installables);
 };
 

diff --git a/src/nix/develop.cc b/src/nix/develop.cc
@@ -341,7 +341,7 @@ struct Common : InstallableCommand, MixProfile
             auto dir = absPath(dir_);
             auto installable = parseInstallable(store, installable_);
             auto builtPaths = Installable::toStorePaths(
-                getEvalStore(), store, Realise::Nothing, OperateOn::Output, {installable});
+                getEvalStore(), store, Realise::Nothing, {installable});
             for (auto & path: builtPaths) {
                 auto from = store->printStorePath(path);
                 if (script.find(from) == std::string::npos)
@@ -554,7 +554,7 @@ struct CmdDevelop : Common, MixEnvironment
 
             bool found = false;
 
-            for (auto & path : Installable::toStorePaths(getEvalStore(), store, Realise::Outputs, OperateOn::Output, {bashInstallable})) {
+            for (auto & path : Installable::toStorePaths(getEvalStore(), store, Realise::Outputs, {bashInstallable})) {
                 auto s = store->printStorePath(path) + "/bin/bash";
                 if (pathExists(s)) {
                     shell = s;

diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc
@@ -106,7 +106,7 @@ void printClosureDiff(
 
 using namespace nix;
 
-struct CmdDiffClosures : SourceExprCommand, MixOperateOnOptions
+struct CmdDiffClosures : SourceExprCommand
 {
     std::string _before, _after;
 
@@ -131,9 +131,9 @@ struct CmdDiffClosures : SourceExprCommand, MixOperateOnOptions
     void run(ref<Store> store) override
     {
         auto before = parseInstallable(store, _before);
-        auto beforePath = Installable::toStorePath(getEvalStore(), store, Realise::Outputs, operateOn, before);
+        auto beforePath = Installable::toStorePath(getEvalStore(), store, Realise::Outputs, before);
         auto after = parseInstallable(store, _after);
-        auto afterPath = Installable::toStorePath(getEvalStore(), store, Realise::Outputs, operateOn, after);
+        auto afterPath = Installable::toStorePath(getEvalStore(), store, Realise::Outputs, after);
         printClosureDiff(store, beforePath, afterPath, "");
     }
 };

diff --git a/src/nix/run.cc b/src/nix/run.cc
@@ -99,7 +99,7 @@ struct CmdShell : InstallablesCommand, MixEnvironment
 
     void run(ref<Store> store, Installables && installables) override
     {
-        auto outPaths = Installable::toStorePaths(getEvalStore(), store, Realise::Outputs, OperateOn::Output, installables);
+        auto outPaths = Installable::toStorePaths(getEvalStore(), store, Realise::Outputs, installables);
 
         auto accessor = store->getFSAccessor();
 

diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc
@@ -27,7 +27,7 @@ static std::string filterPrintable(const std::string & s)
     return res;
 }
 
-struct CmdWhyDepends : SourceExprCommand, MixOperateOnOptions
+struct CmdWhyDepends : SourceExprCommand
 {
     std::string _package, _dependency;
     bool all = false;
@@ -82,7 +82,7 @@ struct CmdWhyDepends : SourceExprCommand, MixOperateOnOptions
     void run(ref<Store> store) override
     {
         auto package = parseInstallable(store, _package);
-        auto packagePath = Installable::toStorePath(getEvalStore(), store, Realise::Outputs, operateOn, package);
+        auto packagePath = Installable::toStorePath(getEvalStore(), store, Realise::Outputs, package);
 
         /* We don't need to build `dependency`. We try to get the store
          * path if it's already known, and if not, then it's not a dependency.
@@ -97,7 +97,7 @@ struct CmdWhyDepends : SourceExprCommand, MixOperateOnOptions
         auto dependency = parseInstallable(store, _dependency);
         auto optDependencyPath = [&]() -> std::optional<StorePath> {
             try {
-                return {Installable::toStorePath(getEvalStore(), store, Realise::Derivation, operateOn, dependency)};
+                return {Installable::toStorePath(getEvalStore(), store, Realise::Derivation, dependency)};
             } catch (MissingRealisation &) {
                 return std::nullopt;
             }

diff --git a/tests/dyn-drv/text-hashed-output.sh b/tests/dyn-drv/text-hashed-output.sh
@@ -20,7 +20,7 @@ nix show-derivation "$drvProducingDrv"
 
 out1=$(nix-build ./text-hashed-output.nix -A producingDrv --no-out-link)
 
-nix path-info $drv --derivation --json | jq
-nix path-info $out1 --derivation --json | jq
+nix path-info $drv --json | jq
+nix path-info $drvProducingDrv --json | jq
 
 test $out1 == $drv
diff --git a/tests/why-depends.sh b/tests/why-depends.sh
@@ -6,7 +6,7 @@ cp ./dependencies.nix ./dependencies.builder0.sh ./config.nix $TEST_HOME
 
 cd $TEST_HOME
 
-nix why-depends --derivation --file ./dependencies.nix input2_drv input1_drv
+nix why-depends --file ./dependencies.nix input2_drv.drvPath input1_drv.drvPath
 nix why-depends --file ./dependencies.nix input2_drv input1_drv
 
 nix-build ./dependencies.nix -A input0_drv -o dep