Fix missing key for cache.nixos.org

This commit is contained in:
Jack O'Sullivan 2022-07-17 02:56:26 +01:00
parent b2e06a626c
commit 940aa6145f
4 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,6 @@
{ lib, pkgs, ... }:
let
inherit (lib) concatStringsSep;
inherit (lib.my) attrsToNVList;
in
{
@ -13,7 +14,7 @@ in
''
experimental-features = nix-command flakes ca-derivations
substituters = https://nix-cache.nul.ie https://cache.nixos.org
trusted-public-keys = ${lib.my.nix.cacheKey}
trusted-public-keys = ${concatStringsSep " " lib.my.nix.cacheKeys}
'');
INSTALLER_SSH_OPTS = "-i .keys/deploy.key";

View File

@ -233,9 +233,7 @@ in
"https://nix-cache.nul.ie"
"https://cache.nixos.org"
];
trusted-public-keys = [
lib.my.nix.cacheKey
];
trusted-public-keys = lib.my.nix.cacheKeys;
};
};
})

View File

@ -191,7 +191,10 @@ rec {
};
nix = {
cacheKey = "nix-cache.nul.ie-1:XofkqdHQSGFoPjB6aRohQbCU2ILKFqhNjWfoOdQgF5Y=";
cacheKeys = [
"nix-cache.nul.ie-1:XofkqdHQSGFoPjB6aRohQbCU2ILKFqhNjWfoOdQgF5Y="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
];
};
pubDomain = "nul.ie";

View File

@ -52,9 +52,7 @@ in
"https://nix-cache.nul.ie"
"https://cache.nixos.org"
];
trusted-public-keys = [
lib.my.nix.cacheKey
];
trusted-public-keys = lib.my.nix.cacheKeys;
};
registry = {
pkgs = {