From 5b48a473688b4d9b533d45d657ed74cf830e9c8f Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 10 Jun 2025 08:42:44 -0400 Subject: [PATCH 1/3] beam28Packages: enable recurseIntoAttrs post release --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf24872632db..e87a65147fe7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6375,13 +6375,11 @@ with pkgs; beam26Packages = recurseIntoAttrs beam.packages.erlang_26.beamPackages; beam27Packages = recurseIntoAttrs beam.packages.erlang_27.beamPackages; - # 28 is pre-release - beam28Packages = dontRecurseIntoAttrs beam.packages.erlang_28.beamPackages; + beam28Packages = recurseIntoAttrs beam.packages.erlang_28.beamPackages; beamMinimal26Packages = recurseIntoAttrs beam_minimal.packages.erlang_26.beamPackages; beamMinimal27Packages = recurseIntoAttrs beam_minimal.packages.erlang_27.beamPackages; - # 28 is pre-release - beamMinimal28Packages = dontRecurseIntoAttrs beam_minimal.packages.erlang_28.beamPackages; + beamMinimal28Packages = recurseIntoAttrs beam_minimal.packages.erlang_28.beamPackages; gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { inherit (llvmPackages) openmp; From e80ca86dd990c8df036d15eab926d4a1180d5410 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 10 Jun 2025 08:49:43 -0400 Subject: [PATCH 2/3] elixir_1_19: init at 1.19.0-rc.0 https://github.com/elixir-lang/elixir/releases/tag/v1.19.0-rc.0 --- pkgs/development/beam-modules/default.nix | 5 +++++ pkgs/development/interpreters/elixir/1.19.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/beam-packages.nix | 1 + 4 files changed, 15 insertions(+) create mode 100644 pkgs/development/interpreters/elixir/1.19.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index a5a3ae2d3837..486d91a5ab06 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -52,6 +52,11 @@ let # BEAM-based languages. elixir = elixir_1_18; + elixir_1_19 = lib'.callElixir ../interpreters/elixir/1.19.nix { + inherit erlang; + debugInfo = true; + }; + elixir_1_18 = lib'.callElixir ../interpreters/elixir/1.18.nix { inherit erlang; debugInfo = true; diff --git a/pkgs/development/interpreters/elixir/1.19.nix b/pkgs/development/interpreters/elixir/1.19.nix new file mode 100644 index 000000000000..91e229662fe9 --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.19.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: +mkDerivation { + version = "1.19.0-rc.0"; + sha256 = "sha256-9Upk3DLxFVetK3fChLr0UjRi2WnvSndVvBW0RfM5hTk="; + # https://hexdocs.pm/elixir/1.19.0-rc.0/compatibility-and-deprecations.html#table-of-deprecations + minimumOTPVersion = "26"; + escriptPath = "lib/elixir/scripts/generate_app.escript"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e87a65147fe7..ba5b2b2ff79e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6349,6 +6349,7 @@ with pkgs; erlang_27 erlang_26 elixir + elixir_1_19 elixir_1_18 elixir_1_17 elixir_1_16 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 1ebab1f7c89f..9851d9ae487f 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -51,6 +51,7 @@ in # `beam.packages.erlang_27.elixir`. inherit (self.packages.erlang) elixir + elixir_1_19 elixir_1_18 elixir_1_17 elixir_1_16 From c4f3b97eb76f1da5c4f671b336ab41cb87bad234 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 10 Jun 2025 08:56:16 -0400 Subject: [PATCH 3/3] elixir: add passthru.updateScript based on major/minor This should avoid 1.18 from upgrading to 1.19-rc* --- .../interpreters/elixir/generic-builder.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index d014d0cab673..638c83d8ce5a 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -5,6 +5,7 @@ fetchFromGitHub, erlang, makeWrapper, + nix-update-script, coreutils, curl, bash, @@ -117,6 +118,15 @@ stdenv.mkDerivation ({ --replace "/usr/bin/env elixir" "${elixirShebang}" ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(${lib.versions.major version}\\.${lib.versions.minor version}\\.[0-9\\-rc.]+)" + "--override-filename" + "pkgs/development/interpreters/elixir/${lib.versions.major version}.${lib.versions.minor version}.nix" + ]; + }; + pos = builtins.unsafeGetAttrPos "sha256" args; meta = with lib; { homepage = "https://elixir-lang.org/";