From bc5d68306b40b8522ffb69ba6cff91898c2fbbff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20W=C3=B6gi?= <789@webuhu.at>
Date: Mon, 6 Dec 2021 17:07:01 +0100
Subject: [PATCH] elixir_1_13: init (#148619)

---
 pkgs/development/beam-modules/default.nix     | 16 ++++++----------
 pkgs/development/interpreters/elixir/1.13.nix |  9 +++++++++
 pkgs/development/interpreters/elixir/1.7.nix  |  7 -------
 pkgs/development/interpreters/elixir/1.8.nix  |  7 -------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/beam-packages.nix              |  4 ++--
 6 files changed, 18 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/interpreters/elixir/1.13.nix
 delete mode 100644 pkgs/development/interpreters/elixir/1.7.nix
 delete 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 1c9d5099b44f..1cbdf04bef93 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -42,7 +42,12 @@ let
       elvis-erlang = callPackage ./elvis-erlang { };
 
       # BEAM-based languages.
-      elixir = elixir_1_12;
+      elixir = elixir_1_13;
+
+      elixir_1_13 = lib'.callElixir ../interpreters/elixir/1.13.nix {
+        inherit erlang;
+        debugInfo = true;
+      };
 
       elixir_1_12 = lib'.callElixir ../interpreters/elixir/1.12.nix {
         inherit erlang;
@@ -64,17 +69,8 @@ let
         debugInfo = true;
       };
 
-      elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix {
-        erlang = pkgs.beam.interpreters.erlangR23;
-        debugInfo = true;
-      };
-
       # Remove old versions of elixir, when the supports fades out:
       # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
-      elixir_1_7 = lib'.callElixir ../interpreters/elixir/1.7.nix {
-        inherit erlang;
-        debugInfo = true;
-      };
 
       elixir_ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; };
 
diff --git a/pkgs/development/interpreters/elixir/1.13.nix b/pkgs/development/interpreters/elixir/1.13.nix
new file mode 100644
index 000000000000..22f087766a17
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.13.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.13.0";
+  sha256 = "1rkrx9kbs2nhkmzydm02r4wkb8wxwmg8iv0nqilpzj0skkxd6k8w";
+  minimumOTPVersion = "22";
+}
diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix
deleted file mode 100644
index 10ebd5438a11..000000000000
--- a/pkgs/development/interpreters/elixir/1.7.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  version = "1.7.4";
-  sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla";
-  minimumOTPVersion = "19";
-}
diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix
deleted file mode 100644
index 931fa50b1f72..000000000000
--- a/pkgs/development/interpreters/elixir/1.8.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation {
-  version = "1.8.2";
-  sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq";
-  minimumOTPVersion = "20";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 029bb7ceb66a..7655339b5813 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13304,7 +13304,7 @@ with pkgs;
   inherit (beam.interpreters)
     erlang erlangR24 erlangR23 erlangR22 erlangR21
     erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02
-    elixir elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7
+    elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9
     elixir_ls;
 
   erlang_nox = beam_nox.interpreters.erlang;
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index bdd8b6e32516..828545ff7fa0 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -89,9 +89,9 @@ with beam; {
 
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
-    # `beam.packages.erlangR23.elixir`.
+    # `beam.packages.erlangR24.elixir`.
     inherit (packages.erlang)
-      elixir elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls;
+      elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_ls;
 
     inherit (packages.erlang) lfe lfe_1_3;
   };