elixir: update default to 1.18 (#368356)

NixOS · Dec 26, 2024 · bbc2fd2 · bbc2fd2
2 parents a4ae334 + e187a6e
commit bbc2fd2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -20,6 +20,8 @@
 
 - The default Erlang OTP version has been updated to 27.
 
+- The default Elixir version has been updated to 1.18.
+
 - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default.
 - A `nixos-rebuild build-image` sub-command has been added.
 

diff --git a/pkgs/servers/web-apps/livebook/default.nix → pkgs/by-name/li/livebook/package.nix b/pkgs/servers/web-apps/livebook/default.nix → pkgs/by-name/li/livebook/package.nix
diff --git a/pkgs/by-name/ne/next-ls/package.nix b/pkgs/by-name/ne/next-ls/package.nix
@@ -1,15 +1,10 @@
 {
   lib,
 
-  beam_minimal,
+  beamPackages,
   fetchFromGitHub,
 }:
 
-let
-  beamPackages = beam_minimal.packages.erlang_27;
-  elixir = beamPackages.elixir_1_17;
-in
-
 beamPackages.mixRelease rec {
   pname = "next-ls";
   version = "0.23.2";
@@ -22,14 +17,11 @@ beamPackages.mixRelease rec {
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
-    inherit src version elixir;
+    inherit src version;
     pname = "next-ls-deps";
     hash = "sha256-4Rt5Q0fX+fbncvxyXdpIhgEvn9VYX/QDxDdnbanT21Q=";
   };
 
-  inherit elixir;
-  inherit (beamPackages) erlang;
-
   removeCookie = false;
 
   # replace installPhase to change release target

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
@@ -43,7 +43,7 @@ let
       elvis-erlang = callPackage ./elvis-erlang { };
 
       # BEAM-based languages.
-      elixir = elixir_1_17;
+      elixir = elixir_1_18;
 
       elixir_1_18 = lib'.callElixir ../interpreters/elixir/1.18.nix {
         inherit erlang;
@@ -73,7 +73,10 @@ let
       # Remove old versions of elixir, when the supports fades out:
       # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
 
-      ex_doc = callPackage ./ex_doc { inherit elixir fetchMixDeps mixRelease; };
+      ex_doc = callPackage ./ex_doc {
+        inherit fetchMixDeps mixRelease;
+        elixir = elixir_1_17;
+      };
 
       elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; };
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -1864,7 +1864,7 @@ with pkgs;
 
   kavita = callPackage ../servers/web-apps/kavita { };
 
-  livebook = callPackage ../servers/web-apps/livebook {
+  livebook = callPackage ../by-name/li/livebook/package.nix {
     elixir = elixir_1_17;
     beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; });
   };