From 26857cc8515c62b2e51b907ff197f1622b983d57 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 6 Oct 2020 19:36:43 +0200 Subject: [PATCH 1/2] elixir_1_11: init at 1.11.0 Set elixir_1_11 as default elixir version. --- pkgs/development/beam-modules/default.nix | 7 ++++++- pkgs/development/interpreters/elixir/1.11.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/interpreters/elixir/1.11.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 7fbec79cbd4..a5de4dfb3bb 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 00000000000..c84968ae92a --- /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 60f13ff9ec3..9d53b47bf88 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 139749e7d39..14399d7ac95 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; }; From 6e0d3b659ccb22bdd49a023fa4b2d023ac203846 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 18 Oct 2020 18:57:52 +0200 Subject: [PATCH 2/2] Elixir: 1.11.0 -> 1.11.1 --- pkgs/development/interpreters/elixir/1.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix index c84968ae92a..3dcd8c19ba8 100644 --- a/pkgs/development/interpreters/elixir/1.11.nix +++ b/pkgs/development/interpreters/elixir/1.11.nix @@ -3,7 +3,7 @@ # 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"; + version = "1.11.1"; + sha256 = "0czyv98sq9drlvdwv3gw9vnhn8qa3va4xh5vdqpg7m6b93l1r3p1"; minimumOTPVersion = "21"; }