Merge master into staging-next

2021-02-11 18:16:48 +00:00
parent 1af73c223c bde46aca9e
commit 402b752521
35 changed files with 200 additions and 139 deletions
@@ -155,9 +155,9 @@ let
      # 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."
+         + " Please use `lib` instead."
         + " For more information see https://github.com/NixOS/nixpkgs/issues/108938")
-        lib else throw "`stdenv.lib` is a deprecated alias for `pkgs.lib`";
+        lib else throw "`stdenv.lib` is a deprecated alias for `lib`";

      inherit fetchurlBoot;