diff options
| -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 9d5764a6307f..c1b9bfd39f92 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 6e74af5fce52..f1cf34b160c6 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"; |