Styx: Adjust to nix-darwin updates
This commit is contained in:
parent
9167e2b435
commit
ca818ed4ce
1 changed files with 23 additions and 24 deletions
|
@ -12,31 +12,32 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
binaryCaches = [
|
settings = {
|
||||||
|
experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
extra-platforms = [ "x86_64-darwin" ];
|
||||||
|
|
||||||
|
auto-optimise-store = true;
|
||||||
|
keep-derivations = true;
|
||||||
|
keep-outputs = true;
|
||||||
|
|
||||||
|
substituters = [
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://nifoc.cachix.org"
|
"https://nifoc.cachix.org"
|
||||||
] ++ optionals secret.nix-cache.nifoc.enabled [
|
] ++ optionals secret.nix-cache.nifoc.enabled [
|
||||||
secret.nix-cache.nifoc.s3Url
|
secret.nix-cache.nifoc.s3Url
|
||||||
];
|
];
|
||||||
|
|
||||||
binaryCachePublicKeys = [
|
trusted-public-keys = [
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
|
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
|
||||||
] ++ optionals secret.nix-cache.nifoc.enabled [
|
] ++ optionals secret.nix-cache.nifoc.enabled [
|
||||||
secret.nix-cache.nifoc.publicKeyValue
|
secret.nix-cache.nifoc.publicKeyValue
|
||||||
];
|
];
|
||||||
|
|
||||||
trustedUsers = [
|
trusted-users = [ "@admin" ];
|
||||||
"@admin"
|
};
|
||||||
];
|
|
||||||
|
|
||||||
extraOptions = ''
|
configureBuildUsers = true;
|
||||||
experimental-features = nix-command flakes
|
|
||||||
extra-platforms = x86_64-darwin
|
|
||||||
keep-derivations = true
|
|
||||||
keep-outputs = true
|
|
||||||
auto-optimise-store = true
|
|
||||||
'';
|
|
||||||
|
|
||||||
distributedBuilds = true;
|
distributedBuilds = true;
|
||||||
|
|
||||||
|
@ -50,8 +51,6 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
users = {
|
users = {
|
||||||
nix.configureBuildUsers = true;
|
|
||||||
|
|
||||||
users.daniel = {
|
users.daniel = {
|
||||||
home = "/Users/daniel";
|
home = "/Users/daniel";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue