From fb7fc6a3731dc618ba530e5d7fb297be627a98a4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 19 Jan 2025 17:47:47 -0500 Subject: [PATCH] Fix another URL in the docs --- doc/manual/source/command-ref/nix-copy-closure.md | 2 +- doc/manual/source/language/string-interpolation.md | 4 ++-- doc/manual/source/protocols/json/derivation.md | 2 +- doc/manual/source/protocols/json/store-object-info.md | 2 +- src/libcmd/misc-store-flags.cc | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/manual/source/command-ref/nix-copy-closure.md b/doc/manual/source/command-ref/nix-copy-closure.md index 7a976fbdd..50d16866e 100644 --- a/doc/manual/source/command-ref/nix-copy-closure.md +++ b/doc/manual/source/command-ref/nix-copy-closure.md @@ -44,7 +44,7 @@ When using public key authentication, you can avoid typing the passphrase with ` Also copy the outputs of [derivation]s included in the closure. - [derivation]: @docroot@/glossary.md#gloss-store-derivation + [derivation]: @docroot@/glossary.md#gloss-derivation - `--use-substitutes` / `-s` diff --git a/doc/manual/source/language/string-interpolation.md b/doc/manual/source/language/string-interpolation.md index 562d705f8..a503d5f04 100644 --- a/doc/manual/source/language/string-interpolation.md +++ b/doc/manual/source/language/string-interpolation.md @@ -22,9 +22,9 @@ Rather than writing "--with-freetype2-library=" + freetype + "/lib" ``` -(where `freetype` is an [output path]), you can instead write +(where `freetype` is a [derivation expression]), you can instead write -[derivation]: @docroot@/glossary.md#gloss-derivation +[derivation expression]: @docroot@/glossary.md#gloss-derivation-expression ```nix "--with-freetype2-library=${freetype}/lib" diff --git a/doc/manual/source/protocols/json/derivation.md b/doc/manual/source/protocols/json/derivation.md index 2f85340d6..7109c4efa 100644 --- a/doc/manual/source/protocols/json/derivation.md +++ b/doc/manual/source/protocols/json/derivation.md @@ -7,7 +7,7 @@ > and subject to change. The JSON serialization of a -[derivations](@docroot@/glossary.md#gloss-store-derivation) +[derivations](@docroot@/glossary.md#gloss-derivation) is a JSON object with the following fields: * `name`: diff --git a/doc/manual/source/protocols/json/store-object-info.md b/doc/manual/source/protocols/json/store-object-info.md index 6b4f48437..ba21bf537 100644 --- a/doc/manual/source/protocols/json/store-object-info.md +++ b/doc/manual/source/protocols/json/store-object-info.md @@ -44,7 +44,7 @@ In other words, the same store object residing in different store could have dif If known, the path to the [derivation] from which this store object was produced. Otherwise `null`. - [derivation]: @docroot@/glossary.md#gloss-store-derivation + [derivation]: @docroot@/glossary.md#gloss-derivation * `registrationTime` (optional): diff --git a/src/libcmd/misc-store-flags.cc b/src/libcmd/misc-store-flags.cc index 06552c032..7a84385a5 100644 --- a/src/libcmd/misc-store-flags.cc +++ b/src/libcmd/misc-store-flags.cc @@ -120,7 +120,7 @@ Args::Flag contentAddressMethod(ContentAddressMethod * method) - [`text`](@docroot@/store/store-object/content-address.md#method-text): Like `flat`, but used for - [derivations](@docroot@/glossary.md#store-derivation) serialized in store object and + [derivations](@docroot@/glossary.md#gloss-derivation) serialized in store object and [`builtins.toFile`](@docroot@/language/builtins.html#builtins-toFile). For advanced use-cases only; for regular usage prefer `nar` and `flat`.