diff options
author | jade <lix@jade.fyi> | 2024-07-19 18:52:46 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@localhost> | 2024-07-19 18:52:46 +0000 |
commit | 22252825c4ea5e8a60eea419ebe352cab184e8b6 (patch) | |
tree | 1f0a118a2c07a7b996814ba34b7fa8235fc4a879 /src | |
parent | aba5f19680b2f4c29d7ce2ff5e2a89128c1cb26d (diff) | |
parent | 26e56780caaa3fe23bd1c7589c9ebde220381683 (diff) |
Merge changes Id8b3d289,Ib75ab5b8,I3792eeb3 into main
* changes:
Fixup a bunch of references to nixos.org manuals
Add release notes for removing overflow from Nix language
expr: fix a compiler warning about different signs in comparison
Diffstat (limited to 'src')
-rw-r--r-- | src/libexpr/eval.cc | 2 | ||||
-rw-r--r-- | src/libexpr/primops.cc | 8 | ||||
-rw-r--r-- | src/libstore/build/derivation-goal.cc | 2 | ||||
-rw-r--r-- | src/libstore/build/worker.cc | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 5e6c71e1f..c7b708d1d 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1901,7 +1901,7 @@ void EvalState::autoCallFunction(Bindings & args, Value & fun, Value & res) Nix attempted to evaluate a function as a top level expression; in this case it must have its arguments supplied either by default values, or passed explicitly with '--arg' or '--argstr'. See -https://nixos.org/manual/nix/stable/language/constructs.html#functions.)", symbols[i.name]) +https://docs.lix.systems/manual/lix/stable/language/constructs.html#functions)", symbols[i.name]) .atPos(i.pos).withFrame(*fun.lambda.env, *fun.lambda.fun).debugThrow(); } } diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 471ddc4f3..c1c606d1d 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -3275,10 +3275,12 @@ static RegisterPrimOp primop_all({ static void prim_genList(EvalState & state, const PosIdx pos, Value * * args, Value & v) { - auto len = state.forceInt(*args[1], pos, "while evaluating the second argument passed to builtins.genList").value; + auto len_ = state.forceInt(*args[1], pos, "while evaluating the second argument passed to builtins.genList").value; - if (len < 0) - state.error<EvalError>("cannot create list of size %1%", len).atPos(pos).debugThrow(); + if (len_ < 0) + state.error<EvalError>("cannot create list of size %1%", len_).atPos(pos).debugThrow(); + + size_t len = len_; // More strict than striclty (!) necessary, but acceptable // as evaluating map without accessing any values makes little sense. diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index ef16cd011..6d86a44d0 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -781,7 +781,7 @@ void DerivationGoal::tryLocalBuild() { throw Error( "unable to build with a primary store that isn't a local store; " "either pass a different '--store' or enable remote builds." - "\nhttps://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html"); + "\nhttps://docs.lix.systems/manual/lix/stable/advanced-topics/distributed-builds.html"); } diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc index e3fec292a..39bcd5d92 100644 --- a/src/libstore/build/worker.cc +++ b/src/libstore/build/worker.cc @@ -333,11 +333,11 @@ void Worker::run(const Goals & _topGoals) if (getMachines().empty()) throw Error("unable to start any build; either increase '--max-jobs' " "or enable remote builds." - "\nhttps://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html"); + "\nhttps://docs.lix.systems/manual/lix/stable/advanced-topics/distributed-builds.html"); else throw Error("unable to start any build; remote machines may not have " "all required system features." - "\nhttps://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html"); + "\nhttps://docs.lix.systems/manual/lix/stable/advanced-topics/distributed-builds.html"); } assert(!awake.empty()); |