From 0768a2e9279c425b72c8ae1e02bd3ae2efc6b60c Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Tue, 21 Mar 2023 20:06:06 -0300
Subject: [PATCH] erlang_21: remove

---
 pkgs/development/interpreters/erlang/21.nix |  7 -------
 pkgs/top-level/aliases.nix                  |  4 +++-
 pkgs/top-level/all-packages.nix             |  2 +-
 pkgs/top-level/beam-packages.nix            | 16 +---------------
 4 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/interpreters/erlang/21.nix

diff --git a/pkgs/development/interpreters/erlang/21.nix b/pkgs/development/interpreters/erlang/21.nix
deleted file mode 100644
index 3af1198bdd54..000000000000
--- a/pkgs/development/interpreters/erlang/21.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  version = "21.3.8.24";
-  sha256 = "sha256-FNs+M4KFFKzfb4EG513HtyQ9eRRtxSPMpYq0bmRgY3g=";
-  meta.knownVulnerabilities = [ "CVE-2022-37026" ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 55f59aa8c8b1..81cbe3f85f4b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -439,7 +439,9 @@ mapAliases ({
   enyo-doom = enyo-launcher; # Added 2022-09-09
   epoxy = libepoxy; # Added 2021-11-11
   epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
-  inherit (beam.interpreters) erlangR25 erlangR24 erlangR23 erlangR22 erlangR21; # added 2023-03-21
+  inherit (beam.interpreters) erlangR25 erlangR24 erlangR23 erlangR22; # added 2023-03-21
+  erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21
+  erlangR21 = erlang_21;
   esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12
   etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22
   eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b31acb068c1..0336f895e825 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16578,7 +16578,7 @@ with pkgs;
   };
 
   inherit (beam.interpreters)
-    erlang erlang_25 erlang_24 erlang_23 erlang_22 erlang_21
+    erlang erlang_25 erlang_24 erlang_23 erlang_22
     erlang_odbc erlang_javac erlang_odbc_javac
     elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
     elixir-ls;
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 079b3c51f440..ae7fd07d0838 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -14,7 +14,7 @@ let
   self = beam;
 
   # Aliases added 2023-03-21
-  versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "25" "24" "23" "22" "21" ];
+  versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "25" "24" "23" "22" ];
 
   interpretersAliases = versionLoop (version: {
     "erlangR${version}" = self.interpreters."erlang_${version}";
@@ -99,19 +99,6 @@ in
       odbcSupport = true;
     };
 
-    erlang_21 = self.beamLib.callErlang ../development/interpreters/erlang/21.nix {
-      openssl = openssl_1_1;
-      wxGTK = wxGTK32;
-      autoconf = buildPackages.autoconf269;
-      inherit wxSupport systemdSupport;
-    };
-    erlang_21_odbc = self.interpreters.erlang_21.override { odbcSupport = true; };
-    erlang_21_javac = self.interpreters.erlang_21.override { javacSupport = true; };
-    erlang_21_odbc_javac = self.interpreters.erlang_21.override {
-      javacSupport = true;
-      odbcSupport = true;
-    };
-
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlang_24.elixir`.
@@ -132,6 +119,5 @@ in
     erlang_24 = self.packagesWith self.interpreters.erlang_24;
     erlang_23 = self.packagesWith self.interpreters.erlang_23;
     erlang_22 = self.packagesWith self.interpreters.erlang_22;
-    erlang_21 = self.packagesWith self.interpreters.erlang_21;
   } // packagesAliases;
 }