TEMP

NixOS · Nov 13, 2023 · 2b22320 · 2b22320
1 parent 51877bf
commit 2b22320
Show file tree

Hide file tree

Showing 23 changed files with 105 additions and 62 deletions.
diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc
@@ -11,7 +11,8 @@
 namespace nix {
 
 HasEvalState::HasEvalState(AbstractArgs & args)
-    : MixEvalArgs(args)
+    : MixRepair(args)
+    , MixEvalArgs(args)
 {
     args.addFlag({
         .longName = "debugger",

diff --git a/src/libcmd/command.hh b/src/libcmd/command.hh
@@ -35,7 +35,8 @@ private:
 struct EvalCommand : virtual DrvCommand, virtual HasEvalState
 {
     EvalCommand()
-        : HasEvalState(static_cast<DrvCommand &>(*this))
+        : MixRepair(static_cast<Command &>(*this))
+        , HasEvalState(static_cast<DrvCommand &>(*this))
     { }
 };
 
@@ -95,7 +96,8 @@ struct ParseInstallableValueArgs : virtual ParseInstallableArgs, virtual MixFlak
 struct SourceExprCommand : virtual EvalCommand, ParseInstallableValueArgs, virtual GetRawInstallables
 {
     SourceExprCommand()
-        : HasEvalState(static_cast<DrvCommand &>(*this))
+        : MixRepair(static_cast<Command &>(*this))
+        , HasEvalState(static_cast<DrvCommand &>(*this))
         , MixFlakeOptions(static_cast<EvalCommand &>(*this))
         , ParseInstallableValueArgs(static_cast<GetRawInstallables &>(*this))
     { }

diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc
@@ -13,6 +13,7 @@
 namespace nix {
 
 MixEvalArgs::MixEvalArgs(AbstractArgs & args)
+    : MixRepair(args)
 {
     args.addFlag({
         .longName = "arg",

diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
@@ -45,7 +45,8 @@ void completeFlakeInputPath(
 }
 
 MixFlakeOptions::MixFlakeOptions(AbstractArgs & args)
-    : HasEvalState(args)
+    : MixRepair(args)
+    , HasEvalState(args)
 {
     auto category = "Common flake-related options";
 
@@ -90,7 +91,7 @@ MixFlakeOptions::MixFlakeOptions(AbstractArgs & args)
             lockFlags.writeLockFile = false;
             lockFlags.inputOverrides.insert_or_assign(
                 flake::parseInputPath(inputPath),
-                parseFlakeRef(flakeRef, absPath(getCommandBaseDir()), true));
+                parseFlakeRef(flakeRef, absPath(args.getCommandBaseDir()), true));
         }},
         .completer = {[&](AddCompletions & completions, size_t n, std::string_view prefix) {
             if (n == 0) {
@@ -132,7 +133,7 @@ MixFlakeOptions::MixFlakeOptions(AbstractArgs & args)
             auto evalState = getEvalState();
             auto flake = flake::lockFlake(
                 *evalState,
-                parseFlakeRef(flakeRef, absPath(getCommandBaseDir())),
+                parseFlakeRef(flakeRef, absPath(args.getCommandBaseDir())),
                 { .writeLockFile = false });
             for (auto & [inputName, input] : flake.lockFile.root->inputs) {
                 auto input2 = flake.lockFile.findInput({inputName}); // resolve 'follows' nodes
@@ -151,7 +152,8 @@ MixFlakeOptions::MixFlakeOptions(AbstractArgs & args)
 }
 
 ParseInstallableValueArgs::ParseInstallableValueArgs(GetRawInstallables & args)
-    : HasEvalState(args)
+    : MixRepair(args)
+    , HasEvalState(args)
     , MixFlakeOptions(args)
     , args(args)
 {
@@ -424,10 +426,10 @@ Installables ParseInstallableValueArgs::parseInstallables(
             state->eval(e, *vFile);
         }
         else if (file) {
-            state->evalFile(lookupFileArg(*state, *file, CanonPath::fromCwd(getCommandBaseDir())), *vFile);
+            state->evalFile(lookupFileArg(*state, *file, CanonPath::fromCwd(args.getCommandBaseDir())), *vFile);
         }
         else {
-            CanonPath dir(CanonPath::fromCwd(getCommandBaseDir()));
+            CanonPath dir(CanonPath::fromCwd(args.getCommandBaseDir()));
             auto e = state->parseExprFromString(*expr, state->rootPath(dir));
             state->eval(e, *vFile);
         }
@@ -463,7 +465,7 @@ Installables ParseInstallableValueArgs::parseInstallables(
             }
 
             try {
-                auto [flakeRef, fragment] = parseFlakeRefWithFragment(std::string { prefix }, absPath(getCommandBaseDir()));
+                auto [flakeRef, fragment] = parseFlakeRefWithFragment(std::string { prefix }, absPath(args.getCommandBaseDir()));
                 result.push_back(make_ref<InstallableFlake>(
                         this,
                         getEvalState(),
@@ -508,7 +510,7 @@ std::vector<FlakeRef> ParseInstallableValueArgs::getFlakeRefsForCompletion()
     for (auto i : args.getRawInstallables())
         res.push_back(parseFlakeRefWithFragment(
             expandTilde(i),
-            absPath(getCommandBaseDir())).first);
+            absPath(args.getCommandBaseDir())).first);
     return res;
 }
 

diff --git a/src/libmain/common-args.hh b/src/libmain/common-args.hh
@@ -50,13 +50,13 @@ struct MixJSON : virtual Args
     }
 };
 
-struct MixRepair : virtual Args
+struct MixRepair
 {
     RepairFlag repair = NoRepair;
 
-    MixRepair()
+    MixRepair(AbstractArgs & args)
     {
-        addFlag({
+        args.addFlag({
             .longName = "repair",
             .description =
                 "During evaluation, rewrite missing or corrupted files in the Nix store. "

diff --git a/src/libutil/args.hh b/src/libutil/args.hh
@@ -171,6 +171,16 @@ struct AbstractArgs
 
     virtual void expectArgs(ExpectedArg && arg) = 0;
 
+    /**
+     * @brief Get the base directory for the command.
+     *
+     * @return Generally the working directory, but in case of a shebang
+     *         interpreter, returns the directory of the script.
+     *
+     * This only returns the correct value after parseCmdline() has run.
+     */
+    virtual Path getCommandBaseDir() const = 0;
+
     static CompleterFun completePath;
 
     static CompleterFun completeDir;
@@ -192,16 +202,6 @@ public:
      */
     virtual std::string doc() { return ""; }
 
-    /**
-     * @brief Get the base directory for the command.
-     *
-     * @return Generally the working directory, but in case of a shebang
-     *         interpreter, returns the directory of the script.
-     *
-     * This only returns the correct value after parseCmdline() has run.
-     */
-    virtual Path getCommandBaseDir() const;
-
 protected:
 
     /**
@@ -276,6 +276,8 @@ public:
         expectedArgs.emplace_back(std::move(arg));
     }
 
+    virtual Path getCommandBaseDir() const override;
+
     /**
      * Expect a string argument.
      */

diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
@@ -154,8 +154,9 @@ static void main_nix_build(int argc, char * * argv)
     {
         MyArgs(const std::string & programName,
             std::function<bool(Strings::iterator & arg, const Strings::iterator & end)> parseArg)
-            : LegacyArgs(programName, parseArg)
-            , MixEvalArgs((LegacyArgs &) *this)
+            : MixRepair(static_cast<LegacyArgs &>(*this))
+            , LegacyArgs(programName, parseArg)
+            , MixEvalArgs(static_cast<LegacyArgs &>(*this))
         { }
     };
 

diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
@@ -1424,8 +1424,9 @@ static int main_nix_env(int argc, char * * argv)
         {
             MyArgs(const std::string & programName,
                 std::function<bool(Strings::iterator & arg, const Strings::iterator & end)> parseArg)
-                : LegacyArgs(programName, parseArg)
-                , MixEvalArgs((LegacyArgs &) *this)
+                : MixRepair(static_cast<LegacyArgs &>(*this))
+                , LegacyArgs(programName, parseArg)
+                , MixEvalArgs(static_cast<LegacyArgs &>(*this))
             { }
         };
 

diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc
@@ -106,8 +106,9 @@ static int main_nix_instantiate(int argc, char * * argv)
         {
             MyArgs(const std::string & programName,
                 std::function<bool(Strings::iterator & arg, const Strings::iterator & end)> parseArg)
-                : LegacyArgs(programName, parseArg)
-                , MixEvalArgs((LegacyArgs &) *this)
+                : MixRepair(static_cast<LegacyArgs &>(*this))
+                , LegacyArgs(programName, parseArg)
+                , MixEvalArgs(static_cast<LegacyArgs &>(*this))
             { }
         };
 

diff --git a/src/nix/common/build.cc b/src/nix/common/build.cc
@@ -72,6 +72,7 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixJSON, MixProfile, MixRepair
     BuildMode buildMode = bmNormal;
 
     CmdBuild()
+        : MixRepair(static_cast<Command &>(*this))
     {
         addFlag({
             .longName = "out-link",

diff --git a/src/nix/full/bundle.cc b/src/nix/full/bundle.cc
@@ -14,7 +14,8 @@ struct CmdBundle : InstallableValueCommand
     std::optional<Path> outLink;
 
     CmdBundle()
-        : HasEvalState(static_cast<Command &>(*this))
+        : MixRepair(static_cast<Command &>(*this))
+        , HasEvalState(static_cast<Command &>(*this))
         , MixFlakeOptions(static_cast<Command &>(*this))
     {
         addFlag({

diff --git a/src/nix/full/command.cc b/src/nix/full/command.cc
@@ -5,7 +5,8 @@ namespace nix {
 struct ParseInstallableValueAdapter : ParseInstallableValueArgs
 {
     ParseInstallableValueAdapter(GetRawInstallables & args)
-        : HasEvalState(args)
+        : MixRepair(args)
+        , HasEvalState(args)
         , MixFlakeOptions(args)
         , ParseInstallableValueArgs(args)
     { }

diff --git a/src/nix/full/develop.cc b/src/nix/full/develop.cc
@@ -484,7 +484,8 @@ struct CmdDevelop : Common, MixEnvironment
     std::optional<std::string> phase;
 
     CmdDevelop()
-        : HasEvalState(static_cast<Command &>(*this))
+        : MixRepair(static_cast<Command &>(*this))
+        , HasEvalState(static_cast<Command &>(*this))
         , MixFlakeOptions(static_cast<Command &>(*this))
     {
         addFlag({
@@ -671,7 +672,8 @@ struct CmdDevelop : Common, MixEnvironment
 struct CmdPrintDevEnv : Common, MixJSON
 {
     CmdPrintDevEnv()
-        : HasEvalState(static_cast<Command &>(*this))
+        : MixRepair(static_cast<Command &>(*this))
+        , HasEvalState(static_cast<Command &>(*this))
         , MixFlakeOptions(static_cast<Command &>(*this))
     { }
 

diff --git a/src/nix/full/edit.cc b/src/nix/full/edit.cc
@@ -13,7 +13,8 @@ using namespace nix;
 struct CmdEdit : InstallableValueCommand
 {
     CmdEdit()
-        : HasEvalState(static_cast<Command &>(*this))
+        : MixRepair(static_cast<Command &>(*this))
+        , HasEvalState(static_cast<Command &>(*this))
         , MixFlakeOptions(static_cast<Command &>(*this))
     { }
 

diff --git a/src/nix/full/eval.cc b/src/nix/full/eval.cc
@@ -18,7 +18,8 @@ struct CmdEval : MixJSON, InstallableValueCommand, MixReadOnlyOption
     std::optional<Path> writeTo;
 
     CmdEval()
-        : HasEvalState(static_cast<Command &>(*this))
+        : MixRepair(static_cast<Command &>(*this))
+        , HasEvalState(static_cast<Command &>(*this))
         , MixFlakeOptions(static_cast<Command &>(*this))
         , InstallableValueCommand()
         , MixReadOnlyOption(static_cast<Command &>(*this))