From 3ccfb4568da8a7208aefece9160138028680c9f4 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 26 Dec 2024 09:14:19 -0500 Subject: [PATCH 1/4] elixir: update default to 1.18 --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ pkgs/development/beam-modules/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 1fdaef9cc7d2..19627beb972a 100644 --- 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/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index e8e7d9edceaa..fb12ebd58154 100644 --- 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; From 280e6f784555bf7278e9d0538f28982d2c1875c5 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 26 Dec 2024 09:30:18 -0500 Subject: [PATCH 2/4] livebook: move to by-name --- .../livebook/default.nix => by-name/li/livebook/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers/web-apps/livebook/default.nix => by-name/li/livebook/package.nix} (100%) diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/by-name/li/livebook/package.nix similarity index 100% rename from pkgs/servers/web-apps/livebook/default.nix rename to pkgs/by-name/li/livebook/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a11ac299bccd..91030264ae50 100644 --- 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; }); }; From 431238adcc6e6ef70cc15413f2a9186659e1a4ed Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 26 Dec 2024 09:46:16 -0500 Subject: [PATCH 3/4] ex_doc: pin to elixir 1.17 --- pkgs/development/beam-modules/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index fb12ebd58154..8bbd6418c4c2 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -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; }; From e187a6e9f53aa5096083fed0dce051c2d3e3b498 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 26 Dec 2024 09:52:52 -0500 Subject: [PATCH 4/4] next-ls: unpin erlang and elixir --- pkgs/by-name/ne/next-ls/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ne/next-ls/package.nix b/pkgs/by-name/ne/next-ls/package.nix index 07e4b8cb7b40..90dd466ffb59 100644 --- 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