Merge pull request #63810 from NixOS/binaryCaches-default

nix.binaryCaches: always set https://cache.nixos.org
This commit is contained in:
Eelco Dolstra 2019-06-26 18:51:17 +02:00 committed by GitHub
commit 8e620e1bc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -272,10 +272,12 @@ in
binaryCaches = mkOption { binaryCaches = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ https://cache.nixos.org/ ];
description = '' description = ''
List of binary cache URLs used to obtain pre-built binaries List of binary cache URLs used to obtain pre-built binaries
of Nix packages. of Nix packages.
By default https://cache.nixos.org/ is added,
to override it use <literal>lib.mkForce []</literal>.
''; '';
}; };
@ -386,6 +388,7 @@ in
config = { config = {
nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
nix.binaryCaches = [ "https://cache.nixos.org/" ];
environment.etc."nix/nix.conf".source = nixConf; environment.etc."nix/nix.conf".source = nixConf;