From 32e8cec5d9be7963c3cc23541c2679a4a5989348 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 30 Jan 2021 17:23:49 +0700 Subject: stdenv: warn about use of inherited lib --- pkgs/stdenv/generic/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgs/stdenv') diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c7c3bb9f3f3f9..125eff9aec570 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -152,9 +152,12 @@ let inherit lib config stdenv; }) mkDerivation; - # For convenience, bring in the library functions in lib/ so - # packages don't have to do that themselves. - inherit lib; + # Slated for deprecation in 21.11 + lib = 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; inherit fetchurlBoot; -- cgit 1.4.1 From 227693ed69a03605d7b9d5e051f2158aaf8cbe3c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 31 Jan 2021 03:03:11 +0000 Subject: Update pkgs/stdenv/generic/default.nix Co-authored-by: John Ericson --- pkgs/stdenv/generic/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/stdenv') diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 125eff9aec570..52d57a6decee3 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -153,11 +153,11 @@ let }) mkDerivation; # Slated for deprecation in 21.11 - lib = 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 = 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; inherit fetchurlBoot; -- cgit 1.4.1