diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-07-09 10:50:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-09 10:50:24 +0200 |
| commit | 5ba05aaab9adfe2cd1f701c52e85f78c471cd9b6 (patch) | |
| tree | e383499c98d0ddb859fb1a08482816f98d5eb9f0 /pkgs/top-level | |
| parent | ad358f76513c1d9abedfaa8dc5e0d991a419fe70 (diff) | |
| parent | 6db77ccef456fd2d7426fa77390f2c05ac412143 (diff) | |
| download | nixlib-5ba05aaab9adfe2cd1f701c52e85f78c471cd9b6.tar nixlib-5ba05aaab9adfe2cd1f701c52e85f78c471cd9b6.tar.gz nixlib-5ba05aaab9adfe2cd1f701c52e85f78c471cd9b6.tar.bz2 nixlib-5ba05aaab9adfe2cd1f701c52e85f78c471cd9b6.tar.lz nixlib-5ba05aaab9adfe2cd1f701c52e85f78c471cd9b6.tar.xz nixlib-5ba05aaab9adfe2cd1f701c52e85f78c471cd9b6.tar.zst nixlib-5ba05aaab9adfe2cd1f701c52e85f78c471cd9b6.zip | |
Merge pull request #26716 from ankhers/generalize-elixir
Generalize building of Elixir interpreter
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/beam-packages.nix | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a3373a84d2b..deaaf4b2f2c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6040,8 +6040,14 @@ with pkgs; inherit (beam.interpreters) erlang erlang_odbc erlang_javac erlang_odbc_javac - erlangR17 erlangR18 erlangR19 erlangR20 - erlang_basho_R16B02 elixir lfe; + elixir elixir_1_5_rc elixir_1_4 elixir_1_3 + lfe + erlangR16 erlangR16_odbc + erlang_basho_R16B02 erlang_basho_R16B02_odbc + erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac + erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac + erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac + erlangR20 erlangR20_odbc erlangR20_javac erlangR20_odbc_javac; inherit (beam.packages.erlang) rebar rebar3-open rebar3 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index acdbea673328..8d01ad36139d 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -56,7 +56,8 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR19.elixir`. - elixir = packages.erlang.elixir; + inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3; + lfe = packages.erlang.lfe; }; |