summary refs log tree commit diff
path: root/pkgs/stdenv/generic/default.nix
diff options
context:
space:
mode:
authorCole Helbling <cole.e.helbling@outlook.com>2021-02-06 20:17:12 -0800
committerCole Helbling <cole.e.helbling@outlook.com>2021-02-06 21:30:34 -0800
commitc7942b0f8b3cf01b17794a53e883afe30020b8c7 (patch)
tree940eeb28673f185f1efcac8f751fd37f58235a9a /pkgs/stdenv/generic/default.nix
parentafbeed62bb22ef8abec72c7ae1db5d6593f62357 (diff)
downloadnixpkgs-c7942b0f8b3cf01b17794a53e883afe30020b8c7.tar
nixpkgs-c7942b0f8b3cf01b17794a53e883afe30020b8c7.tar.gz
nixpkgs-c7942b0f8b3cf01b17794a53e883afe30020b8c7.tar.bz2
nixpkgs-c7942b0f8b3cf01b17794a53e883afe30020b8c7.tar.lz
nixpkgs-c7942b0f8b3cf01b17794a53e883afe30020b8c7.tar.xz
nixpkgs-c7942b0f8b3cf01b17794a53e883afe30020b8c7.tar.zst
nixpkgs-c7942b0f8b3cf01b17794a53e883afe30020b8c7.zip
stdenv/generic: allowAliases should default to true if unset
Since the deprecation is fairly recent, we should warn by default.

Also fix the wording of the comment: stdenv.lib will be removed for the 21.11
release, not just deprecated (as it already is deprecated).
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
-rw-r--r--pkgs/stdenv/generic/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index a971f204a47..3aa8850ebee 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -152,8 +152,8 @@ let
         inherit lib config stdenv;
       }) mkDerivation;
 
-      # Slated for deprecation in 21.11
-      lib = if config.allowAliases or false then builtins.trace
+      # Slated for removal in 21.11
+      lib = if config.allowAliases or true then builtins.trace
         ( "Warning: `stdenv.lib` is deprecated and will be removed in the next release."
          + " Please use `pkgs.lib` instead."
          + " For more information see https://github.com/NixOS/nixpkgs/issues/108938")