diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-06-21 22:44:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-21 22:44:11 +0200 |
commit | 26434c0924556f1e6ae9c9d569b9c5cb20fa8ba7 (patch) | |
tree | b433c8042781d7f8eb478be4a0dc121ca42cfff6 /pkgs/top-level | |
parent | d401db429047b9bc0340373198e8d542cb11a93f (diff) | |
parent | 4001a680cc9f644f3400c8a8aaddc703bd322935 (diff) | |
download | nixlib-26434c0924556f1e6ae9c9d569b9c5cb20fa8ba7.tar nixlib-26434c0924556f1e6ae9c9d569b9c5cb20fa8ba7.tar.gz nixlib-26434c0924556f1e6ae9c9d569b9c5cb20fa8ba7.tar.bz2 nixlib-26434c0924556f1e6ae9c9d569b9c5cb20fa8ba7.tar.lz nixlib-26434c0924556f1e6ae9c9d569b9c5cb20fa8ba7.tar.xz nixlib-26434c0924556f1e6ae9c9d569b9c5cb20fa8ba7.tar.zst nixlib-26434c0924556f1e6ae9c9d569b9c5cb20fa8ba7.zip |
Merge pull request #42329 from goertzenator/erlang-21.0
add erlang-21.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e667e6d6843c..47c8f1e58724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7175,7 +7175,7 @@ with pkgs; beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlangR18 erlangR19 erlangR20 + erlang erlangR18 erlangR19 erlangR20 erlangR21 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3 lfe lfe_1_2; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 765f69c1b14a..8f8caf755edf 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -41,6 +41,15 @@ rec { javacSupport = true; odbcSupport = true; }; erlangR20_nox = erlangR20.override { wxSupport = false; }; + 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; }; # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { @@ -69,6 +78,7 @@ rec { erlangR18 = packagesWith interpreters.erlangR18; erlangR19 = packagesWith interpreters.erlangR19; erlangR20 = packagesWith interpreters.erlangR20; + erlangR21 = packagesWith interpreters.erlangR21; }; } |