From c257b3e4a7e9862aa343232defde92355d2e17f2 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Mon, 20 May 2024 19:46:09 -0400 Subject: [PATCH 1/2] erlang_27: init 27.0 --- pkgs/development/interpreters/erlang/27.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/erlang/27.nix diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix new file mode 100644 index 000000000000..a6c12ce197a6 --- /dev/null +++ b/pkgs/development/interpreters/erlang/27.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: + +mkDerivation { + version = "27.0"; + sha256 = "sha256-YZWBLcpkm8B4sjoQO7I9ywXcmxXL+Dvq/JYsLsr7TO0="; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce162c99e57e..cbcb5f59bac0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17180,7 +17180,7 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlang_27-rc3 erlang_26 erlang_25 erlang_24 + erlang erlang_27-rc3 erlang_27 erlang_26 erlang_25 erlang_24 erlang_odbc erlang_javac erlang_odbc_javac elixir elixir_1_16 elixir_1_15 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 24b162ec577f..392a7ce532f6 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -41,6 +41,15 @@ in # Standard Erlang versions, using the generic builder. + erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix { + wxGTK = wxGTK32; + parallelBuild = true; + autoconf = buildPackages.autoconf269; + exdocSupport = true; + exdoc = self.packages.erlang_26.ex_doc; + inherit wxSupport systemdSupport; + }; + erlang_27-rc3 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc3.nix { wxGTK = wxGTK32; parallelBuild = true; From 060707a02152528e5e404e1e0f9aa85ccf330e91 Mon Sep 17 00:00:00 2001 From: chiroptical Date: Mon, 20 May 2024 19:52:24 -0400 Subject: [PATCH 2/2] erlang_27-rc3: remove --- pkgs/development/interpreters/erlang/27-rc3.nix | 6 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 9 --------- 4 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/27-rc3.nix diff --git a/pkgs/development/interpreters/erlang/27-rc3.nix b/pkgs/development/interpreters/erlang/27-rc3.nix deleted file mode 100644 index 77e59672c156..000000000000 --- a/pkgs/development/interpreters/erlang/27-rc3.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "27.0-rc3"; - sha256 = "sha256-c2DTIqBd7UxpSv84F1cCB9K+MkJb5OwnWSghtewnw/4="; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ca49ea7496c4..9fd50ff75097 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -341,6 +341,7 @@ mapAliases ({ erlangR22 = erlang_22; erlang_23 = throw "erlangR23 has been removed in favor of newer versions."; # added 2023-09-11 erlangR23 = erlang_23; + erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20 etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29 etcher = throw "'etcher' has been removed because it depended on an insecure version of Electron"; # Added 2024-03-14 eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbcb5f59bac0..56f3d8410737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17180,7 +17180,7 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlang_27-rc3 erlang_27 erlang_26 erlang_25 erlang_24 + erlang erlang_27 erlang_26 erlang_25 erlang_24 erlang_odbc erlang_javac erlang_odbc_javac elixir elixir_1_16 elixir_1_15 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 392a7ce532f6..dec1a5d734ce 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -50,15 +50,6 @@ in inherit wxSupport systemdSupport; }; - erlang_27-rc3 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc3.nix { - wxGTK = wxGTK32; - parallelBuild = true; - autoconf = buildPackages.autoconf269; - exdocSupport = true; - exdoc = self.packages.erlang_26.ex_doc; - inherit wxSupport systemdSupport; - }; - erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix { wxGTK = wxGTK32; parallelBuild = true;