From 81be5eb7c6302e3573578f4013dd99f989b1acad Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 18 Mar 2024 18:13:36 -0700 Subject: [PATCH 1/3] issue importer: list issues that are *not* closed when finding existing issues Turns out also, you cannot set the queue to 0 with any success. So we really should just like, prevent notifications in forgejo itself. Filed a bug for that: https://git.lix.systems/lix-project/web-services/issues/38 Change-Id: Ib96749f3159659182904963cab7b2ef88fc64442 --- maintainers/issue_import.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/issue_import.py b/maintainers/issue_import.py index 4e6fea0fd..be736165d 100644 --- a/maintainers/issue_import.py +++ b/maintainers/issue_import.py @@ -96,7 +96,7 @@ def issues_to_import(): yield from paginate('GET', '/repos/nixos/nix/issues?state=open&labels=lix-import') def issues_already_imported(): - yield from paginate('GET', '/repos/lix-project/lix/issues?state=open&labels=imported') + yield from paginate('GET', '/repos/lix-project/lix/issues?state=all&labels=imported') UPSTREAM_ISSUE_RE = re.compile(r'^Upstream-Issue: https://git\.lix\.systems/NixOS/nix/issues/(\d+)$', re.MULTILINE) @@ -139,7 +139,7 @@ def import_issue(iss: Issue): new_issue(new_title, new_body, new_labels) def go(): - print('Have you turned off the forgejo mailer or limited the queue workers to 0 (assuming that works)? Enter "We have" if so:') + print('Have you turned off the forgejo mailer? Enter "We have" if so:') answer = input('> ') if answer != 'We have': return From 30233d87f9cd8b450da096bb3c987b912e71931c Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 18 Mar 2024 16:20:00 -0700 Subject: [PATCH 2/3] un-nixes ur lix, a little 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 --- src/libcmd/repl.cc | 2 +- src/libexpr/print-ambiguous.cc | 2 +- src/libstore/daemon.cc | 2 +- src/libutil/util.cc | 2 +- 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 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"); From 20b4a97af361695fe7e20eb8584b6900deeae3a5 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 18 Mar 2024 18:26:52 -0700 Subject: [PATCH 3/3] Release notes for builtins.nixVersion change Change-Id: I72c945cab464d26d73f5594ef0a4bb2184545da4 --- doc/manual/rl-next/nixversion-fake.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/manual/rl-next/nixversion-fake.md diff --git a/doc/manual/rl-next/nixversion-fake.md b/doc/manual/rl-next/nixversion-fake.md new file mode 100644 index 000000000..1a97e412c --- /dev/null +++ b/doc/manual/rl-next/nixversion-fake.md @@ -0,0 +1,11 @@ +--- +synopsis: "`builtins.nixVersion` now returns a fixed value \"2.18.3-lix\"" +# prs: cl 558 +--- + +`builtins.nixVersion` now returns a fixed value `"2.18.3-lix"`. This prevents +feature detection assuming that features that exist in Nix post-Lix-branch-off +might exist, even though the Lix version is greater than the Nix version. + +In the future, check for builtins for feature detection. If a feature cannot be +detected by *those* means, please file a Lix bug.