summaryrefslogtreecommitdiff
path: root/modules/nix/default.nix
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2017-07-18 21:13:36 +0200
committerDaiderd Jordan <daiderd@gmail.com>2017-07-18 21:13:36 +0200
commita31b3699b4a2e4b01db0a0e7da0ce38af816e9c4 (patch)
tree6982e1b4f83106b83b67e045bf126ebcad0f6700 /modules/nix/default.nix
parent2156c30ad2e3052384ca2083267b4f47e315c2ac (diff)
nix: include cache.nixos.org by default
Diffstat (limited to 'modules/nix/default.nix')
-rw-r--r--modules/nix/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 6d65574..111d620 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -209,7 +209,7 @@ in
binaryCaches = mkOption {
type = types.listOf types.str;
- default = [ https://cache.nixos.org/ ];
+ example = [ https://cache.example.org/ ];
description = ''
List of binary cache URLs used to obtain pre-built binaries
of Nix packages.
@@ -219,7 +219,7 @@ in
trustedBinaryCaches = mkOption {
type = types.listOf types.str;
default = [ ];
- example = [ http://hydra.nixos.org/ ];
+ example = [ https://hydra.example.org/ ];
description = ''
List of binary cache URLs that non-root users can use (in
addition to those specified using
@@ -308,7 +308,8 @@ in
warnings = mkIf (!config.services.activate-system.enable && cfg.distributedBuilds)
[ "services.activate-system is not enabled, a reboot could cause distributed builds to stop working." ];
- nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+ nix.binaryCaches = mkAfter [ https://cache.nixos.org/ ];
+ nix.binaryCachePublicKeys = mkAfter [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
environment.etc."nix/nix.conf".source = nixConf;