diff options
| -rw-r--r-- | src/libcmd/repl.cc | 2 | ||||
| -rw-r--r-- | src/libexpr/print-ambiguous.cc | 2 | ||||
| -rw-r--r-- | src/libstore/daemon.cc | 2 | ||||
| -rw-r--r-- | src/libutil/util.cc | 2 | ||||
| -rw-r--r-- | src/nix/main.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index f5738963e..b5a798911 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -186,7 +186,7 @@ ReplExitStatus NixRepl::mainLoop() if (state->debugRepl) { debuggerNotice = " debugger"; } - notice("Nix %1%%2%\nType :? for help.", nixVersion, debuggerNotice); + notice("Lix %1%%2%\nType :? for help.", nixVersion, debuggerNotice); } isFirstRepl = false; diff --git a/src/libexpr/print-ambiguous.cc b/src/libexpr/print-ambiguous.cc index eaba02122..3f3c2c45a 100644 --- a/src/libexpr/print-ambiguous.cc +++ b/src/libexpr/print-ambiguous.cc @@ -93,7 +93,7 @@ void printAmbiguous( str << v.fpoint; break; default: - printError("Nix evaluator internal error: printAmbiguous: invalid value type"); + printError("Lix evaluator internal error: printAmbiguous: invalid value type"); abort(); } } diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index 993ade7dc..1181cc9e5 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -1090,7 +1090,7 @@ void processConnection( tunnelLogger->stopWork(&e); if (!errorAllowed) throw; } catch (std::bad_alloc & e) { - auto ex = Error("Nix daemon out of memory"); + auto ex = Error("Lix daemon out of memory"); tunnelLogger->stopWork(&ex); throw; } diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 3849b1a2f..59fb62d3d 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -47,7 +47,7 @@ extern char * * environ __attribute__((weak)); #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 namespace nix { diff --git a/src/nix/main.cc b/src/nix/main.cc index f05c49523..a9c6c6ea2 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -243,7 +243,7 @@ static void showHelp(std::vector<std::string> subcommand, NixArgs & toplevel) auto attr = vRes->attrs->get(state.symbols.create(mdName + ".md")); 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"); |