colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: move builders-user-substitutes to be near the other nix extraOptions

Browse Source
This commit is contained in:
Colin
2023-11-24 08:13:17 +00:00
parent c3c3cff6ca
commit dd0ab41396
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/common/default.nix
View File

@@ -34,11 +34,13 @@
nix.extraOptions = '' nix.extraOptions = ''
# see: `man nix.conf` # see: `man nix.conf`
# allow `nix flake ...` command # useful when a remote builder has a faster internet connection than me
experimental-features = nix-command flakes builders-use-substitutes = true # default: false
# maximum seconds to wait when connecting to binary substituter # maximum seconds to wait when connecting to binary substituter
connect-timeout = 3 # default: 0 connect-timeout = 3 # default: 0
# download-attempts = 5 # default: 5 # download-attempts = 5 # default: 5
# allow `nix flake ...` command
experimental-features = nix-command flakes
# whether to build from source when binary substitution fails # whether to build from source when binary substitution fails
fallback = true # default: false fallback = true # default: false
# whether to keep building dependencies if any other one fails # whether to keep building dependencies if any other one fails

6
hosts/modules/nixcache.nix
View File

@@ -108,11 +108,5 @@ in
}) })
]; ];
nix.distributedBuilds = lib.mkIf (cfg.remote-builders.desko || cfg.remote-builders.servo) true; nix.distributedBuilds = lib.mkIf (cfg.remote-builders.desko || cfg.remote-builders.servo) true;
# optional, useful when the builder has a faster internet connection than yours
# TODO: move this to hosts/common/default.nix where the other extraOptions are
nix.extraOptions = lib.mkIf (cfg.remote-builders.desko || cfg.remote-builders.servo) ''
builders-use-substitutes = true
'';
}; };
} }