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
This commit is contained in:
commit
4050245faa
11
doc/manual/rl-next/nixversion-fake.md
Normal file
11
doc/manual/rl-next/nixversion-fake.md
Normal file
|
@ -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.
|
|
@ -96,7 +96,7 @@ def issues_to_import():
|
||||||
yield from paginate('GET', '/repos/nixos/nix/issues?state=open&labels=lix-import')
|
yield from paginate('GET', '/repos/nixos/nix/issues?state=open&labels=lix-import')
|
||||||
|
|
||||||
def issues_already_imported():
|
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)
|
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)
|
new_issue(new_title, new_body, new_labels)
|
||||||
|
|
||||||
def go():
|
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('> ')
|
answer = input('> ')
|
||||||
if answer != 'We have':
|
if answer != 'We have':
|
||||||
return
|
return
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue