Merge master into staging-next

pkgs/stdenv/generic/default.nix

@@ -152,12 +152,12 @@ let
         inherit lib config stdenv;
       }) mkDerivation;
 
-      # Slated for deprecation in 21.11
-      lib = 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")
-        lib;
+        lib else throw "`stdenv.lib` is a deprecated alias for `pkgs.lib`";
 
       inherit fetchurlBoot;