Merge pull request #27640 from ankhers/update_elixir_rc

elixir: 1.5.0-rc.2 -> 1.5.0
This commit is contained in:
Daiderd Jordan 2017-07-25 19:47:49 +02:00 committed by GitHub
commit 4c013a91f0
4 changed files with 6 additions and 6 deletions

View file

@ -37,9 +37,9 @@ let
buildMix = callPackage ./build-mix.nix {}; buildMix = callPackage ./build-mix.nix {};
# BEAM-based languages. # 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; inherit rebar erlang;
debugInfo = true; debugInfo = true;
}; };

View file

@ -1,7 +1,7 @@
{ mkDerivation }: { mkDerivation }:
mkDerivation rec { mkDerivation rec {
version = "1.5.0-rc.2"; version = "1.5.0";
sha256 = "0wfxsfz1qbb6iapg8j1qskva6j4mccxqvv79xbz08fzzb6n1wvxa"; sha256 = "1y8c0s0wfgv444vhpnz9v8z8rc39kqhzzzkzqjxsh576vd868pbz";
minimumOTPVersion = "18"; minimumOTPVersion = "18";
} }

View file

@ -6095,7 +6095,7 @@ with pkgs;
inherit (beam.interpreters) inherit (beam.interpreters)
erlang erlang_odbc erlang_javac erlang_odbc_javac 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 lfe lfe_1_2
erlangR16 erlangR16_odbc erlangR16 erlangR16_odbc
erlang_basho_R16B02 erlang_basho_R16B02_odbc erlang_basho_R16B02 erlang_basho_R16B02_odbc

View file

@ -56,7 +56,7 @@ rec {
# Other Beam languages. These are built with `beam.interpreters.erlang`. To # Other Beam languages. These are built with `beam.interpreters.erlang`. To
# access for example elixir built with different version of Erlang, use # access for example elixir built with different version of Erlang, use
# `beam.packages.erlangR19.elixir`. # `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; inherit (packages.erlang) lfe lfe_1_2;
}; };