diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-05 00:44:16 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-05 00:44:16 +0200 |
commit | 253ca4957d2e59a4d44ea47705c42629b2e133dd (patch) | |
tree | 6c345b7d7c7f392a6bfad262235371c81631d76e /pkgs/stdenv | |
parent | 48177fb6ea88f89f0bac48aeb2f5bca826ae1dec (diff) | |
parent | af4fc0bf1cb83a126d16bece462ad8d186d6ce73 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6e61b6f12be11..03856d5c07111 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -415,12 +415,6 @@ in inherit (prevStage.stdenv) fetchurlBoot; extraAttrs = { - # remove before 22.11 - glibc = lib.warn - ( "`stdenv.glibc` is deprecated and will be removed in release 22.11." - + " Please use `pkgs.glibc` instead.") - prevStage.glibc; - inherit bootstrapTools; shellPackage = prevStage.bash; }; |