Unverified Commit 216f9f41 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #222436 from superherointj/erlang-upkeep 

erlang_21: remove, erlang_22: remove
parents 060cf0dc 3b24ddfc

pkgs/development/interpreters/erlang/21.nix

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
{ mkDerivation }:



mkDerivation {

  version = "21.3.8.24";

  sha256 = "sha256-FNs+M4KFFKzfb4EG513HtyQ9eRRtxSPMpYq0bmRgY3g=";

  meta.knownVulnerabilities = [ "CVE-2022-37026" ];

}

pkgs/development/interpreters/erlang/22.nix

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
{ mkDerivation }:



mkDerivation {

  version = "22.3.4.24";

  sha256 = "0c9713xa8sjw7nr55hysgcnbvj7gzbrpzdl94y1nqn7vw4ni8is3";

  meta.knownVulnerabilities = [ "CVE-2022-37026" ];

}

pkgs/top-level/aliases.nix

+5 −1
Original line number Diff line number Diff line
@@ -439,7 +439,11 @@ 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; # added 2023-03-21

  erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21

  erlangR21 = erlang_21;

  erlang_22 = throw "erlangR22 has been removed in favor of newer versions."; # added 2023-03-21

  erlangR22 = erlang_22;

  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

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -16572,7 +16572,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_odbc erlang_javac erlang_odbc_javac















    elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10















    elixir-ls;

























pkgs/top-level/beam-packages.nix



+1
−31






























Original line number
Diff line number
Diff line








@@ -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" ];































  interpretersAliases = versionLoop (version: {















    "erlangR${version}" = self.interpreters."erlang_${version}";










@@ -84,34 +84,6 @@ in













      odbcSupport = true;















    };





























    erlang_22 = self.beamLib.callErlang ../development/interpreters/erlang/22.nix {













      openssl = openssl_1_1;













      wxGTK = wxGTK32;













      # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508













      parallelBuild = true;













      autoconf = buildPackages.autoconf269;













      inherit wxSupport systemdSupport;













    };













    erlang_22_odbc = self.interpreters.erlang_22.override { odbcSupport = true; };













    erlang_22_javac = self.interpreters.erlang_22.override { javacSupport = true; };













    erlang_22_odbc_javac = self.interpreters.erlang_22.override {













      javacSupport = true;













      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`.









@@ -131,7 +103,5 @@ in













    erlang_25 = self.packagesWith self.interpreters.erlang_25;















    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;















}