From 3bf2c6652fddf8efc46bc741dc3d7dc901088d03 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 1 Feb 2018 20:02:35 +0100
Subject: [PATCH] nix: don't set signed-binary-caches for nix 2.0

The option was removed.
---
 modules/nix/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 81e0ab9..bab8287 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -5,7 +5,9 @@ with lib;
 let
   cfg = config.nix;
 
-  buildHook = if versionAtLeast (cfg.package.version or "<unknown>") "1.12pre"
+  nixVersionAtLeast = versionAtLeast (cfg.package.version or "<unknown>");
+
+  buildHook = if nixVersionAtLeast "1.12pre"
     then "build-remote" else "build-remote.pl";
 
   nixConf =
@@ -318,6 +320,8 @@ in
       (mkIf (!cfg.distributedBuilds && cfg.buildMachines != []) "nix.distributedBuilds is not enabled, build machines won't be configured.")
     ];
 
+    nix.requireSignedBinaryCaches = mkIf (nixVersionAtLeast "2.0pre") false;
+
     nix.binaryCaches = mkAfter [ https://cache.nixos.org/ ];
     nix.binaryCachePublicKeys = mkAfter [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];