about summary refs log tree commit diff
path: root/modules/core
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2019-06-26 22:42:56 +0200
committeraszlig <aszlig@nix.build>2019-06-26 22:50:20 +0200
commita071bd1f013275666dbd9da723f037225f5a1bfe (patch)
treefdf93eb84f814bf322d1a9105a97f8f031bb0743 /modules/core
parent7d82d833f29e5ef1f545d0f586e09f06f87a1bab (diff)
modules/core: Fix eval for nix.binaryCaches
Besides using the default value from options, I could have just used
mkOptionDefault back then when I was writing this, but fortunately using
the default attribute from the option itself now resulted in an eval
error.

Had I used mkOptionDefault, the value just would have been silently
changed to the default value, since in
https://github.com/NixOS/nixpkgs/pull/63810 the default value now has
priority 1000 instead of 1500 (mkOptionDefault).

So since there is no longer an option default, we now can just set our
binary cache in a singleton list (with priority 100) and be done.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'modules/core')
-rw-r--r--modules/core/common.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/core/common.nix b/modules/core/common.nix
index f394b038..9c9c7a67 100644
--- a/modules/core/common.nix
+++ b/modules/core/common.nix
@@ -1,4 +1,4 @@
-{ config, options, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
@@ -41,9 +41,7 @@ with lib;
       vuizvui = import ../../pkgs { inherit pkgs; };
     });
 
-    nix.binaryCaches = options.nix.binaryCaches.default ++ [
-      "https://headcounter.org/hydra/"
-    ];
+    nix.binaryCaches = [ "https://headcounter.org/hydra/" ];
     nix.binaryCachePublicKeys = [
       "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
     ];