Inherit the elixir versions for beam modules

Rename attributes from elixir-1_x to elixir_1_x

2 files changed, 5 insertions, 8 deletions

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index d1907e07262..ffafe88cc7f 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -37,19 +37,19 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = elixir-1_4;
+        elixir = elixir_1_4;
 
-        elixir-1_5 = lib.callElixir ../interpreters/elixir/1.5.nix "18" {
+        elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix "18" {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
 
-        elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
+        elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
 
-        elixir-1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" {
+        elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 3a2d9161783..8d01ad36139 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -56,10 +56,7 @@ 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;
-    elixir-1_5 = packages.erlang.elixir-1_5;
-    elixir-1_4 = packages.erlang.elixir-1_4;
-    elixir-1_3 = packages.erlang.elixir-1_3;
+    inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3;
 
     lfe = packages.erlang.lfe;
   };