diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07 19:42:01 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07 19:42:01 +0100 |
| commit | 262c21ed464a2593b54ec274a3b84083c0795f2d (patch) | |
| tree | 5d941fab330819560eda9cbee21b65eed3c23fb8 /pkgs | |
| parent | f5052a8679870819472d911a9ad385df3faec1ec (diff) | |
| download | nixlib-262c21ed464a2593b54ec274a3b84083c0795f2d.tar nixlib-262c21ed464a2593b54ec274a3b84083c0795f2d.tar.gz nixlib-262c21ed464a2593b54ec274a3b84083c0795f2d.tar.bz2 nixlib-262c21ed464a2593b54ec274a3b84083c0795f2d.tar.lz nixlib-262c21ed464a2593b54ec274a3b84083c0795f2d.tar.xz nixlib-262c21ed464a2593b54ec274a3b84083c0795f2d.tar.zst nixlib-262c21ed464a2593b54ec274a3b84083c0795f2d.zip | |
Enable __ignoreNulls globally
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 34e8f10dceee..29eb170287ad 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -162,8 +162,6 @@ stdenv.mkDerivation { fi '' else null; - __ignoreNulls = true; - meta = { description = "The Linux kernel"; license = "GPLv2"; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 26f410cee117..fd7b3218e347 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -6,6 +6,12 @@ fetchurlBoot }: +if ! builtins ? langVersion then + + abort "This version of Nixpkgs requires Nix >= 1.2, please upgrade!" + +else + let lib = import ../../lib; @@ -30,6 +36,8 @@ let propagatedUserEnvPkgs = [gcc] ++ lib.filter lib.isDerivation initialPath; + + __ignoreNulls = true; } // rec { |