erlangR25: init at 25.0 (#173674)

NixOS · May 20, 2022 · 814537f · 814537f
1 parent 652e096
commit 814537f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/pkgs/development/interpreters/erlang/R25.nix b/pkgs/development/interpreters/erlang/R25.nix
@@ -0,0 +1,8 @@
+{ mkDerivation }:
+
+# How to obtain `sha256`:
+# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
+mkDerivation {
+  version = "25.0-rc3";
+  sha256 = "1ir42hz81bzxn1shqq0gn824hxd6j774889vjy68psi95psfs8r2";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -14221,7 +14221,7 @@ with pkgs;
   };
 
   inherit (beam.interpreters)
-    erlang erlangR24 erlangR23 erlangR22 erlangR21
+    erlang erlangR25 erlangR24 erlangR23 erlangR22 erlangR21
     erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
     elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9
     elixir_ls;

diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
@@ -20,6 +20,20 @@ with beam; {
 
     # Standard Erlang versions, using the generic builder.
 
+    # R25
+    erlangR25 = lib.callErlang ../development/interpreters/erlang/R25.nix {
+      wxGTK = wxGTK30;
+      parallelBuild = true;
+      autoconf = buildPackages.autoconf269;
+      inherit wxSupport systemdSupport;
+    };
+    erlangR25_odbc = erlangR25.override { odbcSupport = true; };
+    erlangR25_javac = erlangR25.override { javacSupport = true; };
+    erlangR25_odbc_javac = erlangR25.override {
+      javacSupport = true;
+      odbcSupport = true;
+    };
+
     # R24
     erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix {
       wxGTK = wxGTK30;
@@ -106,6 +120,7 @@ with beam; {
     # Packages built with default Erlang version.
     erlang = packages.${defaultVersion};
 
+    erlangR25 = packagesWith interpreters.erlangR25;
     erlangR24 = packagesWith interpreters.erlangR24;
     erlangR23 = packagesWith interpreters.erlangR23;
     erlangR22 = packagesWith interpreters.erlangR22;