From e3863ab2691a34cb3868aca6a35caf97115a83c3 Mon Sep 17 00:00:00 2001
From: cw <789@webuhu.at>
Date: Mon, 27 Jan 2020 10:51:55 +0100
Subject: [PATCH] elixir_1_10: init at 1.10.0

Set elixir_1_10 as default elixir version.
Removed elixir_1_5 as support has faded out now.
---
 pkgs/development/beam-modules/default.nix     | 14 +++++++-------
 pkgs/development/interpreters/elixir/1.10.nix |  9 +++++++++
 pkgs/development/interpreters/elixir/1.5.nix  |  7 -------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/beam-packages.nix              |  6 ++----
 5 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/interpreters/elixir/1.10.nix
 delete mode 100644 pkgs/development/interpreters/elixir/1.5.nix

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 031f7b5dda72..96062a573004 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_9;
+        elixir = elixir_1_10;
+
+        elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix {
+          inherit rebar erlang;
+          debugInfo = true;
+        };
 
         elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix {
           inherit rebar erlang;
@@ -58,13 +63,8 @@ let
           debugInfo = true;
         };
 
-        elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
-          inherit rebar erlang;
-          debugInfo = true;
-        };
-
         # Remove old versions of elixir, when the supports fades out:
-        #   https://hexdocs.pm/elixir/compatibility-and-deprecations.html
+        # 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.10.nix b/pkgs/development/interpreters/elixir/1.10.nix
new file mode 100644
index 000000000000..f9e1451354d6
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.10.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.10.0";
+  sha256 = "1fz22c2jqqm2jvzxar11bh1djg3kqdn5rbxdddlz0cv6mfz7hvgv";
+  minimumOTPVersion = "21";
+}
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
deleted file mode 100644
index 229c42d9f7b2..000000000000
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  version = "1.5.3";
-  sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5";
-  minimumOTPVersion = "18";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa84cd785fb4..ef81629494da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9100,7 +9100,7 @@ in
   inherit (beam.interpreters)
     erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22
     erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
-    elixir elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5
+    elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6
     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 7496449c044c..a24051075636 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -71,8 +71,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_9 elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5;
+    # `beam.packages.erlangR22.elixir`.
+    inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6;
 
     inherit (packages.erlang) lfe lfe_1_2;
   };
@@ -83,7 +83,6 @@ rec {
   # Each field in this tuple represents all Beam packages in nixpkgs built with
   # appropriate Erlang/OTP version.
   packages = {
-
     # Packages built with default Erlang version.
     erlang = packagesWith interpreters.erlang;
     erlangR18 = packagesWith interpreters.erlangR18;
@@ -91,6 +90,5 @@ rec {
     erlangR20 = packagesWith interpreters.erlangR20;
     erlangR21 = packagesWith interpreters.erlangR21;
     erlangR22 = packagesWith interpreters.erlangR22;
-
   };
 }