Re: [PATCH] Documentation: don't repeat configuring the upstream cache

[Alyssa Ross <hi@alyssa.is>]

[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]

Valentin Gagarin <valentin@gagarin.work> writes:

> On NixOS, repeating the default will make it show up in the
> configuration twice.  We're now relying on option merging to do the right
> thing.
>
> On vanilla Linux, repeating was only necessary because not adding
> `extra-` would override whatever was set otherwise.  This is generally
> undesirable, which is why now we're using `extra-` and thus don't need
> to repeat the defaults.
>
> Signed-off-by: Valentin Gagarin <valentin@gagarin.work>
> ---
>  Documentation/installation/binary-cache.adoc | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/installation/binary-cache.adoc b/Documentation/installation/binary-cache.adoc
> index a51e152..ec8d797 100644
> --- a/Documentation/installation/binary-cache.adoc
> +++ b/Documentation/installation/binary-cache.adoc
> @@ -29,9 +29,10 @@ Add the following configuration to /etc/nixos/configuration.nix:
>  { ... }:
>  
>  {
> -  nix.settings.substituters = [ "https://cache.dataaturservice.se/spectrum/" ];
> +  nix.settings.substituters = [
> +    "https://cache.dataaturservice.se/spectrum/"
> +  ];

Thanks!  FYI I'll drop this unrelated formatting change when I apply.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]