Some nix options have been renamed.

This commit is contained in:
Kevin Baensch 2022-02-02 20:21:14 +01:00
parent 1bb1494906
commit 4e59f8c501
Signed by: derped
GPG key ID: C0F1D326C7626543

View file

@ -4,22 +4,24 @@ let
cfg = config.machine; cfg = config.machine;
in { in {
nix = { nix = {
maxJobs = 4;
buildCores = 1;
autoOptimiseStore = true;
useSandbox = true;
package = pkgs.nix_2_4; package = pkgs.nix_2_4;
allowedUsers = [ "root" ] ++ (map (n: n.name) cfg.administrators); settings = {
max-jobs = 4;
cores = 1;
sandbox = true;
auto-optimise-store = true;
trusted-substituters = [
"https://cache.nixos.org"
] ++ cfg.binaryCaches;
trusted-public-keys = [ (lib.fileContents "${cfg.secretPath}/hydra_cache.pub") ];
substituters = [
"https://cache.nixos.org"
] ++ cfg.binaryCaches;
allowed-users = [ "root" ] ++ (map (n: n.name) cfg.administrators);
};
extraOptions = '' extraOptions = ''
build-timeout = 86400 # 24 hours build-timeout = 86400 # 24 hours
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
binaryCachePublicKeys = [ (lib.fileContents "${cfg.secretPath}/hydra_cache.pub") ];
trustedBinaryCaches = [
"https://cache.nixos.org"
] ++ cfg.binaryCaches;
binaryCaches = [
"https://cache.nixos.org"
] ++ cfg.binaryCaches;
}; };
} }