Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkgs/development/beam-modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,27 @@ let
# BEAM-based languages.
elixir = elixir_1_7;

elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix {
inherit rebar erlang;
debugInfo = true;
};

elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
inherit rebar erlang;
debugInfo = true;
};

elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
inherit rebar erlang;
debugInfo = true;
};

elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
inherit rebar erlang;
debugInfo = true;
};

elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix {
elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
inherit rebar erlang;
debugInfo = true;
};
Expand Down
7 changes: 0 additions & 7 deletions pkgs/development/interpreters/elixir/1.4.nix

This file was deleted.

7 changes: 7 additions & 0 deletions pkgs/development/interpreters/elixir/1.9.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{ mkDerivation }:

mkDerivation rec {
version = "1.9.0";
sha256 = "0yfqh07wjgm10v6acn5pw8l8jndjly5kpzgw4harlj81wcaymlsw";
minimumOTPVersion = "20";
}
6 changes: 2 additions & 4 deletions pkgs/development/interpreters/elixir/generic-builder.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ in

buildInputs = [ erlang rebar makeWrapper ];

LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
"${pkgs.glibcLocales}/lib/locale/locale-archive";
LANG = "en_US.UTF-8";
LC_TYPE = "en_US.UTF-8";
LANG = "C.UTF-8";
LC_TYPE = "C.UTF-8";

setupHook = ./setup-hook.sh;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8242,7 +8242,7 @@ in
inherit (beam.interpreters)
erlang erlangR18 erlangR19 erlangR20 erlangR21
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;

inherit (beam.packages.erlang)
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/beam-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,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_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;
};
Expand Down