summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJustin Wood <justin.k.wood@gmail.com>2017-06-26 12:42:56 -0400
committerJustin Wood <justin.k.wood@gmail.com>2017-06-26 23:13:58 -0400
commit909da3998e9c59c17d17f31a9713b9894a6f8374 (patch)
tree40d731eb15fb7b956d6358d0fdc35ba4360d4283 /pkgs
parentaa1f059116b9e7685e9b905434148c202674f4df (diff)
downloadnixlib-909da3998e9c59c17d17f31a9713b9894a6f8374.tar
nixlib-909da3998e9c59c17d17f31a9713b9894a6f8374.tar.gz
nixlib-909da3998e9c59c17d17f31a9713b9894a6f8374.tar.bz2
nixlib-909da3998e9c59c17d17f31a9713b9894a6f8374.tar.lz
nixlib-909da3998e9c59c17d17f31a9713b9894a6f8374.tar.xz
nixlib-909da3998e9c59c17d17f31a9713b9894a6f8374.tar.zst
nixlib-909da3998e9c59c17d17f31a9713b9894a6f8374.zip
Include Elixir 1.5 rc
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/beam-modules/default.nix5
-rw-r--r--pkgs/development/interpreters/elixir/1.5.nix6
-rw-r--r--pkgs/top-level/beam-packages.nix1
3 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 69265aa53e4d..d1907e07262d 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -39,6 +39,11 @@ let
         # BEAM-based languages.
         elixir = elixir-1_4;
 
+        elixir-1_5 = lib.callElixir ../interpreters/elixir/1.5.nix "18" {
+                       inherit rebar erlang;
+                       debugInfo = true;
+                     };
+
         elixir-1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" {
                        inherit rebar erlang;
                        debugInfo = true;
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
new file mode 100644
index 000000000000..4ef30204ce31
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -0,0 +1,6 @@
+{ mkDerivation }:
+
+mkDerivation rec {
+  version = "1.5.0-rc.0";
+  sha256 = "1p0sawz86w9na56c42ivdacqxzldjb9s9cvl2isj3sy4nwsa0l0j";
+}
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 877feaee8710..3a2d91617838 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -57,6 +57,7 @@ rec {
     # 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;