From a0de58f471c9087d8e6cc60a6078f9940a125b15 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 18 Jun 2019 16:01:35 +0200
Subject: Make subcommand construction in MultiCommand lazy

---
 src/nix/repl.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/nix/repl.cc')

diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index d8f812149..ce17a2b9f 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -764,8 +764,6 @@ struct CmdRepl : StoreCommand, MixEvalArgs
         expectArgs("files", &files);
     }
 
-    std::string name() override { return "repl"; }
-
     std::string description() override
     {
         return "start an interactive environment for evaluating Nix expressions";
@@ -779,6 +777,6 @@ struct CmdRepl : StoreCommand, MixEvalArgs
     }
 };
 
-static RegisterCommand r1(make_ref<CmdRepl>());
+static auto r1 = registerCommand<CmdRepl>("repl");
 
 }
-- 
cgit v1.2.3


From 2dbd69dbf4538d5b7947d192979ff4feab322c2e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 2 Sep 2019 23:04:27 +0200
Subject: nix repl: Run in impure mode

---
 src/nix/repl.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/nix/repl.cc')

diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index 3a70a23c7..0fa1594cc 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -778,6 +778,7 @@ struct CmdRepl : StoreCommand, MixEvalArgs
 
     void run(ref<Store> store) override
     {
+        evalSettings.pureEval = false;
         auto repl = std::make_unique<NixRepl>(searchPath, openStore());
         repl->autoArgs = getAutoArgs(repl->state);
         repl->mainLoop(files);
-- 
cgit v1.2.3


From e0c19ee620c53b52ca7cf69c19d414d782338be1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 10 May 2020 21:35:07 +0200
Subject: Add completion for paths

---
 src/nix/repl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nix/repl.cc')

diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index 0a6a7ab19..2e7b14d08 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -767,7 +767,7 @@ struct CmdRepl : StoreCommand, MixEvalArgs
 
     CmdRepl()
     {
-        expectArgs("files", &files);
+        expectPathArgs("files", &files);
     }
 
     std::string description() override
-- 
cgit v1.2.3


From 4c3c638a05e52cdc3bd96255873b711a28630288 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 11 May 2020 15:46:18 +0200
Subject: Cleanup

---
 src/nix/repl.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/nix/repl.cc')

diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index 2e7b14d08..c936f9cc2 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -767,7 +767,11 @@ struct CmdRepl : StoreCommand, MixEvalArgs
 
     CmdRepl()
     {
-        expectPathArgs("files", &files);
+        expectArgs({
+            .label = "files",
+            .handler = {&files},
+            .completer = completePath
+        });
     }
 
     std::string description() override
-- 
cgit v1.2.3