From 14af15dbff21ad91e7633d91f2c7ba1bc5badd77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Mar 2014 11:33:36 +0100
Subject: [PATCH] Explicitly require Nix 1.6

People using Nix < 1.6 previously got an unhelpful "infinite
recursion" error.
---
 default.nix                     | 8 +++++++-
 pkgs/stdenv/generic/default.nix | 6 ------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/default.nix b/default.nix
index 9d5764a6307..c1b9bfd39f9 100644
--- a/default.nix
+++ b/default.nix
@@ -1 +1,7 @@
-import ./pkgs/top-level/all-packages.nix
+if ! builtins ? nixVersion || builtins.compareVersions "1.6" builtins.nixVersion == 1 then
+
+  abort "This version of Nixpkgs requires Nix >= 1.6, please upgrade!"
+
+else
+
+  import ./pkgs/top-level/all-packages.nix
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 6e74af5fce5..f1cf34b160c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -12,12 +12,6 @@ let lib = import ../../../lib; in lib.makeOverridable (
 , extraBuildInputs ? []
 }:
 
-if ! builtins ? langVersion then
-
-  abort "This version of Nixpkgs requires Nix >= 1.2, please upgrade!"
-
-else
-
 let
 
   allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";