public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33986 from ankhers/update_elixir_1_6

Browse Source 
Elixir: 1.6-rc -> 1.6
This commit is contained in:
adisbladis 2018-01-18 09:59:41 +08:00 committed by GitHub
commit ebd422af9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/beam-modules/default.nix
View File

@ -42,9 +42,9 @@ let
buildMix = callPackage ./build-mix.nix {}; buildMix = callPackage ./build-mix.nix {};
# BEAM-based languages. # BEAM-based languages.
elixir = elixir_1_5; elixir = elixir_1_6;
elixir_1_6_rc = lib.callElixir ../interpreters/elixir/1.6.nix { elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
inherit rebar erlang; inherit rebar erlang;
debugInfo = true; debugInfo = true;
}; };

4
pkgs/development/interpreters/elixir/1.6.nix
View File

@ -1,7 +1,7 @@
{ mkDerivation }: { mkDerivation }:
mkDerivation rec { mkDerivation rec {
version = "1.6.0-rc.1"; version = "1.6.0";
sha256 = "06g6n9qvv57xa07fyaqhki2y8zw24m3smcjiw1wiw9pzl5a76iby"; sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx";
minimumOTPVersion = "18"; minimumOTPVersion = "18";
} }

2
pkgs/top-level/all-packages.nix
View File

@ -6677,7 +6677,7 @@ with pkgs;
inherit (beam.interpreters) inherit (beam.interpreters)
erlang erlangR18 erlangR19 erlangR20 erlang erlangR18 erlangR19 erlangR20
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
elixir elixir_1_6_rc elixir_1_5 elixir_1_4 elixir_1_3 elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3
lfe lfe_1_2; lfe lfe_1_2;
inherit (beam.packages.erlang) inherit (beam.packages.erlang)

2
pkgs/top-level/beam-packages.nix
View File

@ -52,7 +52,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_6_rc elixir_1_5 elixir_1_4 elixir_1_3; inherit (packages.erlang) elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3;
inherit (packages.erlang) lfe lfe_1_2; inherit (packages.erlang) lfe lfe_1_2;
}; };