dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix missing key for cache.nixos.org

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devshell/default.nix
View File

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

4
home-manager/modules/common.nix
View File

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

5
lib/default.nix
View File

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

4
nixos/modules/common.nix
View File

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