lix-project/lix
18
45
Fork 24
Code Issues 315 Code Review (Gerrit) Projects 1 Releases Wiki Activity

un-nixes ur lix, a little

Browse source 
I didn't really go attack the docs because we need to pull a bunch of
PRs. I went looking for strings in the code that called lix nix.

Change-Id: I2138bb4dd239096bc530946b281db7f875195b39
This commit is contained in:
jade 2024-03-18 16:20:00 -07:00
parent 81be5eb7c6
commit 30233d87f9
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/repl.cc
View file

@ -186,7 +186,7 @@ ReplExitStatus NixRepl::mainLoop()
if (state->debugRepl) { if (state->debugRepl) {
debuggerNotice = " debugger"; debuggerNotice = " debugger";
} }
notice("Nix %1%%2%\nType :? for help.", nixVersion, debuggerNotice); notice("Lix %1%%2%\nType :? for help.", nixVersion, debuggerNotice);
} }
isFirstRepl = false; isFirstRepl = false;

2
src/libexpr/print-ambiguous.cc
View file

@ -93,7 +93,7 @@ void printAmbiguous(
str << v.fpoint; str << v.fpoint;
break; break;
default: default:
printError("Nix evaluator internal error: printAmbiguous: invalid value type"); printError("Lix evaluator internal error: printAmbiguous: invalid value type");
abort(); abort();
} }
} }

2
src/libstore/daemon.cc
View file

@ -1090,7 +1090,7 @@ void processConnection(
tunnelLogger->stopWork(&e); tunnelLogger->stopWork(&e);
if (!errorAllowed) throw; if (!errorAllowed) throw;
} catch (std::bad_alloc & e) { } catch (std::bad_alloc & e) {
auto ex = Error("Nix daemon out of memory"); auto ex = Error("Lix daemon out of memory");
tunnelLogger->stopWork(&ex); tunnelLogger->stopWork(&ex);
throw; throw;
} }

2
src/libutil/util.cc
View file

@ -47,7 +47,7 @@ extern char * * environ __attribute__((weak));
#ifdef NDEBUG #ifdef NDEBUG
#error "Nix may not be built with assertions disabled (i.e. with -DNDEBUG)." #error "Lix may not be built with assertions disabled (i.e. with -DNDEBUG)."
#endif #endif
namespace nix { namespace nix {

2
src/nix/main.cc
View file

@ -243,7 +243,7 @@ static void showHelp(std::vector<std::string> subcommand, NixArgs & toplevel)
auto attr = vRes->attrs->get(state.symbols.create(mdName + ".md")); auto attr = vRes->attrs->get(state.symbols.create(mdName + ".md"));
if (!attr) if (!attr)
throw UsageError("Nix has no subcommand '%s'", concatStringsSep("", subcommand)); throw UsageError("`nix` has no subcommand '%s'", concatStringsSep("", subcommand));
auto markdown = state.forceString(*attr->value, noPos, "while evaluating the lowdown help text"); auto markdown = state.forceString(*attr->value, noPos, "while evaluating the lowdown help text");