diff options
| author | jade <lix@jade.fyi> | 2024-03-18 20:19:53 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix> | 2024-03-18 20:19:53 -0600 |
| commit | 4050245faab80dad6cedaa13e481278456a139c0 (patch) | |
| tree | 850daceb04c9bbf2a00732ba42ff3f50c1fd0df0 /src/libstore | |
| parent | f38ae92a38a66b597dbd6975219d6ddb4f52fa4f (diff) | |
| parent | 20b4a97af361695fe7e20eb8584b6900deeae3a5 (diff) | |
Merge changes I72c945ca,I2138bb4d,Ib96749f3 into main
* changes:
Release notes for builtins.nixVersion change
un-nixes ur lix, a little
issue importer: list issues that are *not* closed when finding existing issues
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/daemon.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |