From 4345715025d618689edeb66dfa1f33557d426a20 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Cugnet Date: Wed, 26 Dec 2018 16:09:12 +0100 Subject: [PATCH 1/3] elixir_1_8: init at 1.8.0-rc.1 --- pkgs/development/beam-modules/default.nix | 5 +++++ pkgs/development/interpreters/elixir/1.8.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/elixir/1.8.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index c5be1c78a55f..94ffa32a678d 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -44,6 +44,11 @@ let # BEAM-based languages. elixir = elixir_1_7; + elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { + inherit rebar erlang; + debugInfo = true; + }; + elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { inherit rebar erlang; debugInfo = true; diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix new file mode 100644 index 000000000000..65c008f8ac6b --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.8.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.8.0-rc.1"; + sha256 = "06k9q46cwn79ic6kw0b0mskf9rqlgm02jb8n1ajz55kmw134kq6m"; + minimumOTPVersion = "20"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bcb2803c0eb..7917ccffd13e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7697,7 +7697,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_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3 + elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3 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 85bdc59e6dbd..8255a2223f96 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -61,7 +61,8 @@ 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_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; + inherit (packages.erlang) + elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; inherit (packages.erlang) lfe lfe_1_2; }; From 5cefef0d12428771e5fd84c35fe505b1a3e81ac9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Cugnet Date: Sat, 5 Jan 2019 12:34:35 +0100 Subject: [PATCH 2/3] elixir_1_3: Remove since it is not supported anymore --- pkgs/development/beam-modules/default.nix | 5 ----- pkgs/development/interpreters/elixir/1.3.nix | 7 ------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 3 +-- 4 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 pkgs/development/interpreters/elixir/1.3.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 94ffa32a678d..dd374bcccb4c 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -69,11 +69,6 @@ let debugInfo = true; }; - elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix { - inherit rebar erlang; - debugInfo = true; - }; - lfe = lfe_1_2; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; diff --git a/pkgs/development/interpreters/elixir/1.3.nix b/pkgs/development/interpreters/elixir/1.3.nix deleted file mode 100644 index 43d48e2cf7cd..000000000000 --- a/pkgs/development/interpreters/elixir/1.3.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation rec { - version = "1.3.4"; - sha256 = "01qqv1ghvfadcwcr5p88w8j217cgaf094pmpqllij3l0q1yg104l"; - minimumOTPVersion = "18"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7917ccffd13e..46bf24b5a2df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7697,7 +7697,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_1_3 + elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 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 8255a2223f96..f05cf3d9290e 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -61,8 +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 elixir_1_3; + inherit (packages.erlang) elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4; inherit (packages.erlang) lfe lfe_1_2; }; From 69d3eb6b6f28856db99d1ced1d5ec5218bbe1fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 5 Jan 2019 12:38:20 +0100 Subject: [PATCH 3/3] elixir: link to compatibility table --- pkgs/development/beam-modules/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index dd374bcccb4c..f71379459dcb 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -69,6 +69,9 @@ let debugInfo = true; }; + # Remove old versions of elixir, when the supports fades out: + # https://hexdocs.pm/elixir/compatibility-and-deprecations.html + lfe = lfe_1_2; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };