From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 71A918E99; Tue, 21 Apr 2026 14:17:32 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 7D0738E14; Tue, 21 Apr 2026 14:06:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Flag: YES X-Spam-Level: **** X-Spam-Status: Yes, score=4.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,FROM_SUSPICIOUS_NTLD, FROM_SUSPICIOUS_NTLD_FP,PDS_OTHER_BAD_TLD,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=no autolearn_force=no version=4.0.1 X-Spam-Report: * 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record * 0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) * [136.175.108.32 listed in wl.mailspike.net] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature * -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's * domain * 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs * [URI: gagarin.work (work)] * 2.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD * 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD * 0.0 DMARC_MISSING Missing DMARC policy Received: from mail-108-mta32.mxroute.com (mail-108-mta32.mxroute.com [136.175.108.32]) by atuin.qyliss.net (Postfix) with ESMTPS id BAA988E11 for ; Tue, 21 Apr 2026 14:06:37 +0000 (UTC) Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta32.mxroute.com (ZoneMTA) with ESMTPSA id 19db05d3ca300167f7.001 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 21 Apr 2026 14:06:33 +0000 X-Zone-Loop: 209b518a5e42c0d549a256815bf9e03cf48e953da833 X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gagarin.work; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date :Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=9nIoJGhv35WorDAWa/t+5WRo3che9SiecpYbrBcom7M=; b=EfptnzOev3Eg6tF+DMAbkCGnRr /pW9x7CCrEB/6knDmU/3OBd6JvViLiHI0Iw2wEGxEJc15nn8T+6SubRsMns3Gq2OMEoXaVh0h5mwU viVwTO1a3HEvAMZ2S0/uApm9gv7ckTG38orXCkJ/eAuHuSiWHY1GfxMGM0W8q+zqCVsPDS079JdyL ZKKcGjV0LwLbSn9QFQHZi1VF2dakwF4MD2+S2bZQqlHLUjVPO2nPWSk5PqxVs3nNhl9kfxtPWepuA XJeyIkwS6SQ/84uv5G95i4iogviW/BFMc5J6cPlEUETJFWhI+vZy+MRanSpPTkJJulxt/aT7Qu3ai w9OPkh7A==; From: Valentin Gagarin To: devel@spectrum-os.org Subject: [PATCH] Documentation: don't repeat configuring the upstream cache Date: Tue, 21 Apr 2026 16:05:04 +0200 Message-ID: <20260421140504.479906-1-valentin@gagarin.work> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: valentin@gagarin.work X-MailFrom: valentin@gagarin.work X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-4 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3 Message-ID-Hash: RUUBG73JWQLKRSXGSUX6YOVBMRBWCHZJ X-Message-ID-Hash: RUUBG73JWQLKRSXGSUX6YOVBMRBWCHZJ X-Mailman-Approved-At: Tue, 21 Apr 2026 14:17:30 +0000 CC: Valentin Gagarin X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: <> List-Archive: <> List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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/" + ]; nix.settings.trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "spectrum-os.org-2:foQk3r7t2VpRx92CaXb5ROyy/NBdRJQG2uX2XJMYZfU=" ]; } @@ -49,8 +50,8 @@ Add the following configuration to /etc/nix/nix.conf: [source] ---- -substituters = https://cache.dataaturservice.se/spectrum/ https://cache.nixos.org/ -trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= spectrum-os.org-2:foQk3r7t2VpRx92CaXb5ROyy/NBdRJQG2uX2XJMYZfU= +extra-substituters = https://cache.dataaturservice.se/spectrum/ +extra-trusted-public-keys = spectrum-os.org-2:foQk3r7t2VpRx92CaXb5ROyy/NBdRJQG2uX2XJMYZfU= ---- Run `systemctl restart nix-daemon.service` after making any changes in the Nix -- 2.51.2