Merge pull request #63606 from cw789/master

elixir_1_9: init at 1.9.0
This commit is contained in:
Daiderd Jordan 2019-07-03 20:05:11 +02:00 committed by GitHub
commit d215c18479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 18 deletions

View File

@ -43,6 +43,11 @@ let
# BEAM-based languages. # BEAM-based languages.
elixir = elixir_1_7; elixir = elixir_1_7;
elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix {
inherit rebar erlang;
debugInfo = true;
};
elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
inherit rebar erlang; inherit rebar erlang;
debugInfo = true; debugInfo = true;
@ -63,11 +68,6 @@ let
debugInfo = true; debugInfo = true;
}; };
elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix {
inherit rebar erlang;
debugInfo = true;
};
# Remove old versions of elixir, when the supports fades out: # Remove old versions of elixir, when the supports fades out:
# https://hexdocs.pm/elixir/compatibility-and-deprecations.html # https://hexdocs.pm/elixir/compatibility-and-deprecations.html

View File

@ -1,7 +0,0 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.4.5";
sha256 = "18ivcxmh5bak13k3rjy7jjzin57rgb2nffhwnqb2wl7bpi8mrarw";
minimumOTPVersion = "18";
}

View File

@ -0,0 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.9.0";
sha256 = "0yfqh07wjgm10v6acn5pw8l8jndjly5kpzgw4harlj81wcaymlsw";
minimumOTPVersion = "20";
}

View File

@ -22,10 +22,8 @@ in
buildInputs = [ erlang rebar makeWrapper ]; buildInputs = [ erlang rebar makeWrapper ];
LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux LANG = "C.UTF-8";
"${pkgs.glibcLocales}/lib/locale/locale-archive"; LC_TYPE = "C.UTF-8";
LANG = "en_US.UTF-8";
LC_TYPE = "en_US.UTF-8";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;

View File

@ -8278,7 +8278,7 @@ in
inherit (beam.interpreters) inherit (beam.interpreters)
erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22 erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22
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_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5
lfe lfe_1_2; lfe lfe_1_2;
inherit (beam.packages.erlang) inherit (beam.packages.erlang)

View File

@ -70,7 +70,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_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4; inherit (packages.erlang) elixir elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5;
inherit (packages.erlang) lfe lfe_1_2; inherit (packages.erlang) lfe lfe_1_2;
}; };