summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarco <tanzi.marco@gmail.com>2020-10-06 19:36:43 +0200
committermarco <tanzi.marco@gmail.com>2020-10-07 10:30:35 +0200
commit26857cc8515c62b2e51b907ff197f1622b983d57 (patch)
tree2f5d38a255631973fd676a8716088da9d567f8d0
parent6f90e1df4f27326c52b805cfd01fc79a49208e5c (diff)
elixir_1_11: init at 1.11.0
Set elixir_1_11 as default elixir version.
-rw-r--r--pkgs/development/beam-modules/default.nix7
-rw-r--r--pkgs/development/interpreters/elixir/1.11.nix9
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/beam-packages.nix4
4 files changed, 18 insertions, 4 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 7fbec79cbd46..a5de4dfb3bba 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -36,7 +36,12 @@ let
buildMix = callPackage ./build-mix.nix {};
# BEAM-based languages.
- elixir = elixir_1_10;
+ elixir = elixir_1_11;
+
+ elixir_1_11 = lib.callElixir ../interpreters/elixir/1.11.nix {
+ inherit erlang;
+ debugInfo = true;
+ };
elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix {
inherit erlang;
diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix
new file mode 100644
index 000000000000..c84968ae92a4
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.11.nix
@@ -0,0 +1,9 @@
+{ mkDerivation }:
+
+# How to obtain `sha256`:
+# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
+mkDerivation {
+ version = "1.11.0";
+ sha256 = "0mxckjdy2gbmymvbi1bf146nhmz4icvq6917g8nbyi1gaz5l8rn2";
+ minimumOTPVersion = "21";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60f13ff9ec37..9d53b47bf880 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9981,7 +9981,7 @@ in
inherit (beam.interpreters)
erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
- elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
+ elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
inherit (beam.packages.erlang)
rebar rebar3
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 139749e7d39b..14399d7ac954 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -96,8 +96,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.erlangR22.elixir`.
- inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
+ # `beam.packages.erlangR23.elixir`.
+ inherit (packages.erlang) elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;
inherit (packages.erlang) lfe lfe_1_2 lfe_1_3;
};