diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-01-05 12:59:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-05 12:59:33 +0100 |
commit | 8832292ace9157805173be1efb5a9e0273534d5c (patch) | |
tree | acd71d9d6ea529e32b10886a2784523cfc7ca43b | |
parent | bf6aa78d0d4bf74b4176a1aaffeb9e77216f619f (diff) | |
parent | 69d3eb6b6f28856db99d1ced1d5ec5218bbe1fc9 (diff) | |
download | nixlib-8832292ace9157805173be1efb5a9e0273534d5c.tar nixlib-8832292ace9157805173be1efb5a9e0273534d5c.tar.gz nixlib-8832292ace9157805173be1efb5a9e0273534d5c.tar.bz2 nixlib-8832292ace9157805173be1efb5a9e0273534d5c.tar.lz nixlib-8832292ace9157805173be1efb5a9e0273534d5c.tar.xz nixlib-8832292ace9157805173be1efb5a9e0273534d5c.tar.zst nixlib-8832292ace9157805173be1efb5a9e0273534d5c.zip |
Merge pull request #52932 from ejpcmac/init-elixir_1_8
elixir_1_8: init at 1.8.0-rc.1
-rw-r--r-- | pkgs/development/beam-modules/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/interpreters/elixir/1.3.nix | 7 | ||||
-rw-r--r-- | pkgs/development/interpreters/elixir/1.8.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 2 |
5 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index c5be1c78a55f..f71379459dcb 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; @@ -64,10 +69,8 @@ let debugInfo = true; }; - elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix { - inherit rebar erlang; - 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; }; 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/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 c54b53903508..cc038977a5d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7703,7 +7703,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 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..f05cf3d9290e 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_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; }; |