From 35835e0644f3300d0af1129a20676eb12171b2ce Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 25 Jul 2025 10:04:49 +0200 Subject: [PATCH 1/3] Fix documentation link The file was renamed. We've also moved to nix.dev, but that was redirected properly. Closes #13488 --- src/libexpr/eval.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index f0d64d44a..293b05953 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1812,7 +1812,7 @@ void EvalState::autoCallFunction(const 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.)", +https://nix.dev/manual/nix/stable/language/syntax.html#functions.)", symbols[i.name]) .atPos(i.pos) .withFrame(*fun.lambda().env, *fun.lambda().fun) From b7782809cbe2b2308d4cf54f22a59390c00305ea Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 25 Jul 2025 10:09:22 +0200 Subject: [PATCH 2/3] docs, messages: Resolve nixos.org/manual/nix/stable redirect Loads a bit quicker --- doc/manual/source/release-notes/rl-2.8.md | 2 +- scripts/install-nix-from-tarball.sh | 6 +++--- src/libstore-c/nix_api_store.h | 4 ++-- src/nix/nix.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/manual/source/release-notes/rl-2.8.md b/doc/manual/source/release-notes/rl-2.8.md index 9778e8c3a..686445208 100644 --- a/doc/manual/source/release-notes/rl-2.8.md +++ b/doc/manual/source/release-notes/rl-2.8.md @@ -48,6 +48,6 @@ * `nix run` is now stricter in what it accepts: members of the `apps` flake output are now required to be apps (as defined in [the - manual](https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-run.html#apps)), + manual](https://nix.dev/manual/nix/stable/command-ref/new-cli/nix3-run.html#apps)), and members of `packages` or `legacyPackages` must be derivations (not apps). diff --git a/scripts/install-nix-from-tarball.sh b/scripts/install-nix-from-tarball.sh index ec3264793..38fe3af74 100644 --- a/scripts/install-nix-from-tarball.sh +++ b/scripts/install-nix-from-tarball.sh @@ -40,7 +40,7 @@ fi # Determine if we could use the multi-user installer or not if [ "$(uname -s)" = "Linux" ]; then - echo "Note: a multi-user installation is possible. See https://nixos.org/manual/nix/stable/installation/installing-binary.html#multi-user-installation" >&2 + echo "Note: a multi-user installation is possible. See https://nix.dev/manual/nix/stable/installation/installing-binary.html#multi-user-installation" >&2 fi case "$(uname -s)" in @@ -96,7 +96,7 @@ while [ $# -gt 0 ]; do echo " providing multi-user support and better isolation for local builds." echo " Both for security and reproducibility, this method is recommended if" echo " supported on your platform." - echo " See https://nixos.org/manual/nix/stable/installation/installing-binary.html#multi-user-installation" + echo " See https://nix.dev/manual/nix/stable/installation/installing-binary.html#multi-user-installation" echo "" echo " --no-daemon: Simple, single-user installation that does not require root and is" echo " trivial to uninstall." @@ -144,7 +144,7 @@ if ! [ -e "$dest" ]; then fi if ! [ -w "$dest" ]; then - echo "$0: directory $dest exists, but is not writable by you. This could indicate that another user has already performed a single-user installation of Nix on this system. If you wish to enable multi-user support see https://nixos.org/manual/nix/stable/installation/multi-user.html. If you wish to continue with a single-user install for $USER please run 'chown -R $USER $dest' as root." >&2 + echo "$0: directory $dest exists, but is not writable by you. This could indicate that another user has already performed a single-user installation of Nix on this system. If you wish to enable multi-user support see https://nix.dev/manual/nix/stable/installation/multi-user.html. If you wish to continue with a single-user install for $USER please run 'chown -R $USER $dest' as root." >&2 exit 1 fi diff --git a/src/libstore-c/nix_api_store.h b/src/libstore-c/nix_api_store.h index e55bc3f59..ad3d7b22a 100644 --- a/src/libstore-c/nix_api_store.h +++ b/src/libstore-c/nix_api_store.h @@ -57,14 +57,14 @@ nix_err nix_libstore_init_no_load_config(nix_c_context * context); * ignores `NIX_REMOTE` and the `store` option. For this reason, `NULL` is most likely the better choice. * * For supported store URLs, see [*Store URL format* in the Nix Reference - * Manual](https://nixos.org/manual/nix/stable/store/types/#store-url-format). + * Manual](https://nix.dev/manual/nix/stable/store/types/#store-url-format). * @endparblock * * @param[in] params @parblock * optional, null-terminated array of key-value pairs, e.g. {{"endpoint", * "https://s3.local"}}. * - * See [*Store Types* in the Nix Reference Manual](https://nixos.org/manual/nix/stable/store/types). + * See [*Store Types* in the Nix Reference Manual](https://nix.dev/manual/nix/stable/store/types). * @endparblock * * @return a Store pointer, NULL in case of errors diff --git a/src/nix/nix.md b/src/nix/nix.md index b88bd9a94..10a2aaee8 100644 --- a/src/nix/nix.md +++ b/src/nix/nix.md @@ -44,7 +44,7 @@ R""( Nix is a tool for building software, configurations and other artifacts in a reproducible and declarative way. For more information, see the [Nix homepage](https://nixos.org/) or the [Nix -manual](https://nixos.org/manual/nix/stable/). +manual](https://nix.dev/manual/nix/stable/). # Installables From 49f411c08c7a7c07f5a48291368ab553bbdb0fca Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 25 Jul 2025 10:15:13 +0200 Subject: [PATCH 3/3] Update developer facing links to nix.dev Not broken, but it's a tiny bit quicker --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- .github/ISSUE_TEMPLATE/installer.md | 2 +- .github/ISSUE_TEMPLATE/missing_documentation.md | 2 +- CONTRIBUTING.md | 2 +- src/libcmd/include/nix/cmd/common-eval-args.hh | 2 +- src/libflake/include/nix/flake/flakeref.hh | 6 +++--- src/libutil/include/nix/util/args.hh | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a5005f8a0..af94c3e9e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -45,7 +45,7 @@ assignees: '' - [ ] checked [latest Nix manual] \([source]) - [ ] checked [open bug issues and pull requests] for possible duplicates -[latest Nix manual]: https://nixos.org/manual/nix/unstable/ +[latest Nix manual]: https://nix.dev/manual/nix/development/ [source]: https://github.com/NixOS/nix/tree/master/doc/manual/source [open bug issues and pull requests]: https://github.com/NixOS/nix/labels/bug diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index c75a46951..fe9f9dd20 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -30,7 +30,7 @@ assignees: '' - [ ] checked [latest Nix manual] \([source]) - [ ] checked [open feature issues and pull requests] for possible duplicates -[latest Nix manual]: https://nixos.org/manual/nix/unstable/ +[latest Nix manual]: https://nix.dev/manual/nix/development/ [source]: https://github.com/NixOS/nix/tree/master/doc/manual/source [open feature issues and pull requests]: https://github.com/NixOS/nix/labels/feature diff --git a/.github/ISSUE_TEMPLATE/installer.md b/.github/ISSUE_TEMPLATE/installer.md index ed5e1ce87..070e0bd9b 100644 --- a/.github/ISSUE_TEMPLATE/installer.md +++ b/.github/ISSUE_TEMPLATE/installer.md @@ -38,7 +38,7 @@ assignees: '' - [ ] checked [latest Nix manual] \([source]) - [ ] checked [open installer issues and pull requests] for possible duplicates -[latest Nix manual]: https://nixos.org/manual/nix/unstable/ +[latest Nix manual]: https://nix.dev/manual/nix/development/ [source]: https://github.com/NixOS/nix/tree/master/doc/manual/source [open installer issues and pull requests]: https://github.com/NixOS/nix/labels/installer diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md index 6c334b722..4e05b626d 100644 --- a/.github/ISSUE_TEMPLATE/missing_documentation.md +++ b/.github/ISSUE_TEMPLATE/missing_documentation.md @@ -22,7 +22,7 @@ assignees: '' - [ ] checked [latest Nix manual] \([source]) - [ ] checked [open documentation issues and pull requests] for possible duplicates -[latest Nix manual]: https://nixos.org/manual/nix/unstable/ +[latest Nix manual]: https://nix.dev/manual/nix/development/ [source]: https://github.com/NixOS/nix/tree/master/doc/manual/source [open documentation issues and pull requests]: https://github.com/NixOS/nix/labels/documentation diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad8678962..7231730bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -89,7 +89,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy). ## Making changes to the Nix manual -The Nix reference manual is hosted on https://nixos.org/manual/nix. +The Nix reference manual is hosted on https://nix.dev/manual/nix. The underlying source files are located in [`doc/manual/source`](./doc/manual/source). For small changes you can [use GitHub to edit these files](https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files) For larger changes see the [Nix reference manual](https://nix.dev/manual/nix/development/development/contributing.html). diff --git a/src/libcmd/include/nix/cmd/common-eval-args.hh b/src/libcmd/include/nix/cmd/common-eval-args.hh index 2a0499477..62518ba0e 100644 --- a/src/libcmd/include/nix/cmd/common-eval-args.hh +++ b/src/libcmd/include/nix/cmd/common-eval-args.hh @@ -82,7 +82,7 @@ private: }; /** - * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) + * @param baseDir Optional [base directory](https://nix.dev/manual/nix/development/glossary#gloss-base-directory) */ SourcePath lookupFileArg(EvalState & state, std::string_view s, const Path * baseDir = nullptr); diff --git a/src/libflake/include/nix/flake/flakeref.hh b/src/libflake/include/nix/flake/flakeref.hh index 12d337230..c8c536bce 100644 --- a/src/libflake/include/nix/flake/flakeref.hh +++ b/src/libflake/include/nix/flake/flakeref.hh @@ -81,7 +81,7 @@ struct FlakeRef std::ostream & operator<<(std::ostream & str, const FlakeRef & flakeRef); /** - * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) + * @param baseDir Optional [base directory](https://nix.dev/manual/nix/development/glossary.html#gloss-base-directory) */ FlakeRef parseFlakeRef( const fetchers::Settings & fetchSettings, @@ -92,7 +92,7 @@ FlakeRef parseFlakeRef( bool preserveRelativePaths = false); /** - * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) + * @param baseDir Optional [base directory](https://nix.dev/manual/nix/development/glossary.html#gloss-base-directory) */ std::pair parseFlakeRefWithFragment( const fetchers::Settings & fetchSettings, @@ -103,7 +103,7 @@ std::pair parseFlakeRefWithFragment( bool preserveRelativePaths = false); /** - * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) + * @param baseDir Optional [base directory](https://nix.dev/manual/nix/development/glossary.html#gloss-base-directory) */ std::tuple parseFlakeRefWithFragmentAndExtendedOutputsSpec( const fetchers::Settings & fetchSettings, diff --git a/src/libutil/include/nix/util/args.hh b/src/libutil/include/nix/util/args.hh index 5e64ae1d9..443db445f 100644 --- a/src/libutil/include/nix/util/args.hh +++ b/src/libutil/include/nix/util/args.hh @@ -51,8 +51,8 @@ public: } /** - * @brief Get the [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) for the - * command. + * @brief Get the [base directory](https://nix.dev/manual/nix/development/glossary.html#gloss-base-directory) for + * the command. * * @return Generally the working directory, but in case of a shebang * interpreter, returns the directory of the script.