diff options
| -rw-r--r-- | doc/manual/src/contributing/testing.md | 1 | ||||
| -rw-r--r-- | misc/systemd/nix-daemon.service.in | 2 | ||||
| -rw-r--r-- | src/libexpr/eval.cc | 2 | ||||
| -rw-r--r-- | src/libstore/build/derivation-goal.cc | 2 | ||||
| -rw-r--r-- | src/libstore/build/worker.cc | 4 |
5 files changed, 5 insertions, 6 deletions
diff --git a/doc/manual/src/contributing/testing.md b/doc/manual/src/contributing/testing.md index b6b5318e0..cea6ee3bf 100644 --- a/doc/manual/src/contributing/testing.md +++ b/doc/manual/src/contributing/testing.md @@ -247,7 +247,6 @@ To ensure that characterization testing doesn't make it harder to intentionally The integration tests are defined in the Nix flake under the `hydraJobs.tests` attribute. These tests include everything that needs to interact with external services or run Lix in a non-trivial distributed setup. -Because these tests are expensive and require more than what the standard github-actions setup provides, they only run on the master branch (on <https://hydra.nixos.org/jobset/nix/master>). You can run them manually with `nix build .#hydraJobs.tests.{testName}` or `nix-build -A hydraJobs.tests.{testName}` diff --git a/misc/systemd/nix-daemon.service.in b/misc/systemd/nix-daemon.service.in index 45fbea02c..65356594c 100644 --- a/misc/systemd/nix-daemon.service.in +++ b/misc/systemd/nix-daemon.service.in @@ -1,6 +1,6 @@ [Unit] Description=Nix Daemon -Documentation=man:nix-daemon https://nixos.org/manual +Documentation=man:nix-daemon https://docs.lix.systems/manual/lix/stable RequiresMountsFor=@storedir@ RequiresMountsFor=@localstatedir@ RequiresMountsFor=@localstatedir@/nix/db 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/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()); |