From 24a2ee8fac0902fe8119249a77bfc94556954eb0 Mon Sep 17 00:00:00 2001 From: cw Date: Fri, 21 Jun 2019 11:03:34 +0200 Subject: [PATCH 1/4] elixir: remove obosolete glibcLocales As C.UTF-8 is available now. --- pkgs/development/interpreters/elixir/generic-builder.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 844d6eeb4fb9..b7e98af21097 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -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; From 14fa7440117190a7e99f5fc7da15f24054679e6e Mon Sep 17 00:00:00 2001 From: cw Date: Fri, 21 Jun 2019 11:04:09 +0200 Subject: [PATCH 2/4] elixir_1_9: init at 1.9.0-rc.0 --- pkgs/development/beam-modules/default.nix | 10 +++++----- pkgs/development/interpreters/elixir/1.9.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/interpreters/elixir/1.9.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index a1eedaad6a0f..63d046c7b47e 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -43,6 +43,11 @@ let # BEAM-based languages. 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 { inherit rebar erlang; debugInfo = true; @@ -63,11 +68,6 @@ let 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: # https://hexdocs.pm/elixir/compatibility-and-deprecations.html diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix new file mode 100644 index 000000000000..728b7b123196 --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.9.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.9.0-rc.0"; + sha256 = "0pid607xbgqghljz2mcgqbjxkxsyq16c60kvnmkq680wk8g5ni72"; + minimumOTPVersion = "20"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e9fe1528a01..10d8a29b1b17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index f05cf3d9290e..310188168d07 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -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; }; From 85bfec90aab268d28b698a10715b40103f0c9add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20W=C3=B6gi?= <789@c-w.li> Date: Sun, 23 Jun 2019 20:27:39 +0200 Subject: [PATCH 3/4] Delete Elixir v1.4.nix --- pkgs/development/interpreters/elixir/1.4.nix | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 pkgs/development/interpreters/elixir/1.4.nix diff --git a/pkgs/development/interpreters/elixir/1.4.nix b/pkgs/development/interpreters/elixir/1.4.nix deleted file mode 100644 index 9ddd9062acd9..000000000000 --- a/pkgs/development/interpreters/elixir/1.4.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation rec { - version = "1.4.5"; - sha256 = "18ivcxmh5bak13k3rjy7jjzin57rgb2nffhwnqb2wl7bpi8mrarw"; - minimumOTPVersion = "18"; -} From 056ba630ddf8a0005c9342baded9499906e0de21 Mon Sep 17 00:00:00 2001 From: cw Date: Tue, 25 Jun 2019 09:31:15 +0200 Subject: [PATCH 4/4] elixir_1_9: 1.9.0-rc.0 -> 1.9.0 --- pkgs/development/interpreters/elixir/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix index 728b7b123196..622f2343c6e1 100644 --- a/pkgs/development/interpreters/elixir/1.9.nix +++ b/pkgs/development/interpreters/elixir/1.9.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.9.0-rc.0"; - sha256 = "0pid607xbgqghljz2mcgqbjxkxsyq16c60kvnmkq680wk8g5ni72"; + version = "1.9.0"; + sha256 = "0yfqh07wjgm10v6acn5pw8l8jndjly5kpzgw4harlj81wcaymlsw"; minimumOTPVersion = "20"; }