From d2c9f816e3e8dd1bcb2069276206c19688b62baf Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 3 Jun 2021 19:50:15 +0700 Subject: [PATCH 1/2] stdenv: remove lib --- pkgs/stdenv/generic/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 4cfdb6e4c17d..88ca1b2c7903 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -159,13 +159,6 @@ let inherit lib config stdenv; }) mkDerivation; - # 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 `lib` instead." - + " For more information see https://github.com/NixOS/nixpkgs/issues/108938") - lib else throw "`stdenv.lib` is a deprecated alias for `lib`"; - inherit fetchurlBoot; inherit overrides; From 68b5b850d512676321de635dd6c272dad6d769db Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 3 Jun 2021 19:54:53 +0700 Subject: [PATCH 2/2] coding-conventions: remove reference to stdenv.lib --- doc/contributing/coding-conventions.chapter.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 6516172adde9..1eaa06a659d5 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -183,9 +183,6 @@ - Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first. -- The top-level `lib` must be used in the master and 21.05 branch over its alias `stdenv.lib` as it now causes evaluation errors when aliases are disabled which is the case for ofborg. - `lib` is unrelated to `stdenv`, and so `stdenv.lib` should only be used as a convenience alias when developing locally to avoid having to modify the function inputs just to test something out. - ## Package naming {#sec-package-naming} The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _should not_, _recommended_, _may_, and _optional_ in this section are to be interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). Only _emphasized_ words are to be interpreted in this way.