nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-29 10:12:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6937 from edolstra/fix-repl

Browse Source 
nix repl: Stop the progress bar
This commit is contained in:
Eelco Dolstra 2022-08-22 15:10:01 +02:00 committed by GitHub
commit 7c3ab57515
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libcmd/repl.cc
View File

@ -35,6 +35,7 @@ extern "C" {
#include "finally.hh" #include "finally.hh"
#include "markdown.hh" #include "markdown.hh"
#include "local-fs-store.hh" #include "local-fs-store.hh"
#include "progress-bar.hh"
#if HAVE_BOEHMGC #if HAVE_BOEHMGC
#define GC_INCLUDE_NEW #define GC_INCLUDE_NEW
@ -252,6 +253,10 @@ void NixRepl::mainLoop()
rl_set_list_possib_func(listPossibleCallback); rl_set_list_possib_func(listPossibleCallback);
#endif #endif
/* Stop the progress bar because it interferes with the display of
the repl. */
stopProgressBar();
std::string input; std::string input;
while (true) { while (true) {
@ -1037,9 +1042,10 @@ void runRepl(
struct CmdRepl : InstallablesCommand struct CmdRepl : InstallablesCommand
{ {
CmdRepl(){ CmdRepl() {
evalSettings.pureEval = false; evalSettings.pureEval = false;
} }
void prepare() void prepare()
{ {
if (!settings.isExperimentalFeatureEnabled(Xp::ReplFlake) && !(file) && this->_installables.size() >= 1) { if (!settings.isExperimentalFeatureEnabled(Xp::ReplFlake) && !(file) && this->_installables.size() >= 1) {
@ -1053,12 +1059,15 @@ struct CmdRepl : InstallablesCommand
} }
installables = InstallablesCommand::load(); installables = InstallablesCommand::load();
} }
std::vector<std::string> files; std::vector<std::string> files;
Strings getDefaultFlakeAttrPaths() override Strings getDefaultFlakeAttrPaths() override
{ {
return {""}; return {""};
} }
virtual bool useDefaultInstallables() override
bool useDefaultInstallables() override
{ {
return file.has_value() or expr.has_value(); return file.has_value() or expr.has_value();
} }