From 7a7b0862dbe772582eb3e41c85430faf206fb606 Mon Sep 17 00:00:00 2001 From: Shane Sveller Date: Tue, 16 May 2023 11:11:39 -0500 Subject: [PATCH] erlang_26: init https://www.erlang.org/blog/otp-26-highlights/ https://www.erlang.org/patches/otp-26.0 https://www.erlang.org/doc/apps/erts/notes.html#erts-14.0 --- pkgs/development/interpreters/erlang/26.nix | 7 +++++++ pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/beam-packages.nix | 16 +++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/erlang/26.nix diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix new file mode 100644 index 000000000000..f8d72ab3314c --- /dev/null +++ b/pkgs/development/interpreters/erlang/26.nix @@ -0,0 +1,7 @@ +{ lib, mkDerivation }: + +mkDerivation { + version = "26.0"; + sha256 = "sha256-7z5LkCLyjqGlo48XlcwAUiu1FkmAAewEGnP30QDDme8="; +} + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 874d45b287d4..b4f2d7d2d21a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -459,7 +459,7 @@ 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; # added 2023-03-21 + inherit (beam.interpreters) erlangR26 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 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 9402bd668e79..3210dddfac96 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" ]; + versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "26" "25" "24" "23" ]; interpretersAliases = versionLoop (version: { "erlangR${version}" = self.interpreters."erlang_${version}"; @@ -42,6 +42,19 @@ in # Standard Erlang versions, using the generic builder. + erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix { + wxGTK = wxGTK32; + parallelBuild = true; + autoconf = buildPackages.autoconf269; + inherit wxSupport systemdSupport; + }; + erlang_26_odbc = self.interpreters.erlang_26.override { odbcSupport = true; }; + erlang_26_javac = self.interpreters.erlang_26.override { javacSupport = true; }; + erlang_26_odbc_javac = self.interpreters.erlang_26.override { + javacSupport = true; + odbcSupport = true; + }; + erlang_25 = self.beamLib.callErlang ../development/interpreters/erlang/25.nix { wxGTK = wxGTK32; parallelBuild = true; @@ -100,6 +113,7 @@ in packages = { erlang = self.packages.${self.latestVersion}; + erlang_26 = self.packagesWith self.interpreters.erlang_26; erlang_25 = self.packagesWith self.interpreters.erlang_25; erlang_24 = self.packagesWith self.interpreters.erlang_24; erlang_23 = self.packagesWith self.interpreters.erlang_23;