summary refs log tree commit diff
diff options
context:
space:
mode:
authorJustin Wood <justin.k.wood@gmail.com>2017-07-25 09:42:50 -0400
committerJustin Wood <justin.k.wood@gmail.com>2017-07-25 09:44:49 -0400
commitb7709539b4ecbac08ebc826e8f150e2f91d4b587 (patch)
tree9cd0408f6b6f37d71856b85eaa60379dedcb1d38
parent4a4a33ff8892293006b407aad836d5a3544e638c (diff)
downloadnixpkgs-b7709539b4ecbac08ebc826e8f150e2f91d4b587.tar
nixpkgs-b7709539b4ecbac08ebc826e8f150e2f91d4b587.tar.gz
nixpkgs-b7709539b4ecbac08ebc826e8f150e2f91d4b587.tar.bz2
nixpkgs-b7709539b4ecbac08ebc826e8f150e2f91d4b587.tar.lz
nixpkgs-b7709539b4ecbac08ebc826e8f150e2f91d4b587.tar.xz
nixpkgs-b7709539b4ecbac08ebc826e8f150e2f91d4b587.tar.zst
nixpkgs-b7709539b4ecbac08ebc826e8f150e2f91d4b587.zip
elixir: 1.5.0-rc.2 -> 1.5.0
-rw-r--r--pkgs/development/beam-modules/default.nix4
-rw-r--r--pkgs/development/interpreters/elixir/1.5.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/beam-packages.nix2
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index fa748da0031..3a165fd2f6a 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -37,9 +37,9 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = elixir_1_4;
+        elixir = elixir_1_5;
 
-        elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix {
+        elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index 0c3c0304a9b..23c4db804d3 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.5.0-rc.2";
-  sha256 = "0wfxsfz1qbb6iapg8j1qskva6j4mccxqvv79xbz08fzzb6n1wvxa";
+  version = "1.5.0";
+  sha256 = "1y8c0s0wfgv444vhpnz9v8z8rc39kqhzzzkzqjxsh576vd868pbz";
   minimumOTPVersion = "18";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90f95034b1a..1eea8a9853b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6093,7 +6093,7 @@ with pkgs;
 
   inherit (beam.interpreters)
     erlang erlang_odbc erlang_javac erlang_odbc_javac
-    elixir elixir_1_5_rc elixir_1_4 elixir_1_3
+    elixir elixir_1_5 elixir_1_4 elixir_1_3
     lfe lfe_1_2
     erlangR16 erlangR16_odbc
     erlang_basho_R16B02 erlang_basho_R16B02_odbc
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 62ffaec26f3..fd2a5569171 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -56,7 +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`.
-    inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3;
+    inherit (packages.erlang) elixir elixir_1_5 elixir_1_4 elixir_1_3;
 
     inherit (packages.erlang) lfe lfe_1_2;
   };