diff options
author | cw <789@webuhu.at> | 2020-06-10 20:02:50 +0200 |
---|---|---|
committer | cw <789@webuhu.at> | 2020-06-10 20:06:12 +0200 |
commit | 0a5a19f464e74f416e9bd4f79ecd48a5f6acfc04 (patch) | |
tree | 4a24782332f38e81c313f8b81c8f0484bf804be3 /pkgs/top-level/beam-packages.nix | |
parent | 9a91be049a4a6be1c2cd82a50e53baeded16711b (diff) |
erlangR23: init at 23.0.2
Enable parallel builds for recent Erlang/OTP version R22 and R23 Co-authored-by: Tino Breddin <t@tolbrino.com>
Diffstat (limited to 'pkgs/top-level/beam-packages.nix')
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 81 |
1 files changed, 54 insertions, 27 deletions
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index f6fe58a83d039..84d2a4e311691 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -13,27 +13,46 @@ rec { erlang_odbc_javac = erlangR22_odbc_javac; erlang_nox = erlangR22_nox; - # These are standard Erlang versions, using the generic builder. - erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { + # Standard Erlang versions, using the generic builder. + + # R23 + erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix { wxGTK = wxGTK30; - openssl = openssl_1_0_2; + # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 + parallelBuild = true; }; - erlangR18_odbc = erlangR18.override { odbcSupport = true; }; - erlangR18_javac = erlangR18.override { javacSupport = true; }; - erlangR18_odbc_javac = erlangR18.override { + erlangR23_odbc = erlangR23.override { odbcSupport = true; }; + erlangR23_javac = erlangR23.override { javacSupport = true; }; + erlangR23_odbc_javac = erlangR23.override { javacSupport = true; odbcSupport = true; }; - erlangR18_nox = erlangR18.override { wxSupport = false; }; - erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { + erlangR23_nox = erlangR23.override { wxSupport = false; }; + + # R22 + erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { wxGTK = wxGTK30; - openssl = openssl_1_0_2; + # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 + parallelBuild = true; }; - erlangR19_odbc = erlangR19.override { odbcSupport = true; }; - erlangR19_javac = erlangR19.override { javacSupport = true; }; - erlangR19_odbc_javac = erlangR19.override { + erlangR22_odbc = erlangR22.override { odbcSupport = true; }; + erlangR22_javac = erlangR22.override { javacSupport = true; }; + erlangR22_odbc_javac = erlangR22.override { javacSupport = true; odbcSupport = true; }; - erlangR19_nox = erlangR19.override { wxSupport = false; }; + erlangR22_nox = erlangR22.override { wxSupport = false; }; + + # R21 + erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { + wxGTK = wxGTK30; + }; + erlangR21_odbc = erlangR21.override { odbcSupport = true; }; + erlangR21_javac = erlangR21.override { javacSupport = true; }; + erlangR21_odbc_javac = erlangR21.override { + javacSupport = true; odbcSupport = true; + }; + erlangR21_nox = erlangR21.override { wxSupport = false; }; + + # R20 erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { wxGTK = wxGTK30; }; @@ -43,24 +62,30 @@ rec { javacSupport = true; odbcSupport = true; }; erlangR20_nox = erlangR20.override { wxSupport = false; }; - erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { + + # R19 + erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; + openssl = openssl_1_0_2; }; - erlangR21_odbc = erlangR21.override { odbcSupport = true; }; - erlangR21_javac = erlangR21.override { javacSupport = true; }; - erlangR21_odbc_javac = erlangR21.override { + erlangR19_odbc = erlangR19.override { odbcSupport = true; }; + erlangR19_javac = erlangR19.override { javacSupport = true; }; + erlangR19_odbc_javac = erlangR19.override { javacSupport = true; odbcSupport = true; }; - erlangR21_nox = erlangR21.override { wxSupport = false; }; - erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { + erlangR19_nox = erlangR19.override { wxSupport = false; }; + + # R18 + erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; + openssl = openssl_1_0_2; }; - erlangR22_odbc = erlangR22.override { odbcSupport = true; }; - erlangR22_javac = erlangR22.override { javacSupport = true; }; - erlangR22_odbc_javac = erlangR22.override { + erlangR18_odbc = erlangR18.override { odbcSupport = true; }; + erlangR18_javac = erlangR18.override { javacSupport = true; }; + erlangR18_odbc_javac = erlangR18.override { javacSupport = true; odbcSupport = true; }; - erlangR22_nox = erlangR22.override { wxSupport = false; }; + erlangR18_nox = erlangR18.override { wxSupport = false; }; # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { @@ -85,10 +110,12 @@ rec { packages = { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; - erlangR18 = packagesWith interpreters.erlangR18; - erlangR19 = packagesWith interpreters.erlangR19; - erlangR20 = packagesWith interpreters.erlangR20; - erlangR21 = packagesWith interpreters.erlangR21; + + erlangR23 = packagesWith interpreters.erlangR23; erlangR22 = packagesWith interpreters.erlangR22; + erlangR21 = packagesWith interpreters.erlangR21; + erlangR20 = packagesWith interpreters.erlangR20; + erlangR19 = packagesWith interpreters.erlangR19; + erlangR18 = packagesWith interpreters.erlangR18; }; } |