alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Explicitly require Nix 1.6

Browse source 
People using Nix < 1.6 previously got an unhelpful "infinite
recursion" error.
This commit is contained in:
Eelco Dolstra 2014-03-17 11:33:36 +01:00
parent c0f3f6e396
commit 14af15dbff
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
default.nix
View file

@ -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

6
pkgs/stdenv/generic/default.nix
View file

@ -12,12 +12,6 @@ let lib = import ../../../lib; in lib.makeOverridable (
, extraBuildInputs ? [] , extraBuildInputs ? []
}: }:
if ! builtins ? langVersion then
abort "This version of Nixpkgs requires Nix >= 1.2, please upgrade!"
else
let let
allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1";