diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-07-25 19:47:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-25 19:47:49 +0200 |
| commit | 4c013a91f013b0b9c825b93c28a7658afc7d71ac (patch) | |
| tree | d1cc640ff90d58f61b60a6648dcd4d4f249bc274 | |
| parent | ba3ab41a6a4a0b69f0562e68c199d7f8d5542f10 (diff) | |
| parent | b7709539b4ecbac08ebc826e8f150e2f91d4b587 (diff) | |
| download | nixlib-4c013a91f013b0b9c825b93c28a7658afc7d71ac.tar nixlib-4c013a91f013b0b9c825b93c28a7658afc7d71ac.tar.gz nixlib-4c013a91f013b0b9c825b93c28a7658afc7d71ac.tar.bz2 nixlib-4c013a91f013b0b9c825b93c28a7658afc7d71ac.tar.lz nixlib-4c013a91f013b0b9c825b93c28a7658afc7d71ac.tar.xz nixlib-4c013a91f013b0b9c825b93c28a7658afc7d71ac.tar.zst nixlib-4c013a91f013b0b9c825b93c28a7658afc7d71ac.zip | |
Merge pull request #27640 from ankhers/update_elixir_rc
elixir: 1.5.0-rc.2 -> 1.5.0
| -rw-r--r-- | pkgs/development/beam-modules/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/elixir/1.5.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/beam-packages.nix | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index fa748da0031c..3a165fd2f6a4 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 0c3c0304a9b4..23c4db804d3f 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 110b79fce59e..0c39bdda0bc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6095,7 +6095,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 62ffaec26f3f..fd2a55691712 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; }; |