diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-17 11:33:36 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-17 11:33:36 +0100 |
commit | 14af15dbff21ad91e7633d91f2c7ba1bc5badd77 (patch) | |
tree | 08ebbc14e9a4293468eef531f5e8f0b686ffc20e | |
parent | c0f3f6e3965ef9a5dfc2eb0a38344a370f050bd2 (diff) |
Explicitly require Nix 1.6
People using Nix < 1.6 previously got an unhelpful "infinite recursion" error.
-rw-r--r-- | default.nix | 8 | ||||
-rw-r--r-- | pkgs/stdenv/generic/default.nix | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/default.nix b/default.nix index 9d5764a6307f1..c1b9bfd39f92a 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 6e74af5fce52a..f1cf34b160c64 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"; |