From 46a4c640f05eb5f26e7951e11e5e7d9d425dfde1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 18 Jul 2025 21:49:30 +0200 Subject: [PATCH 1/2] ocamlformat_0_26_2: build with OCaml 5.2 Fixes eval, which previously failed with: ``` ocamlformat 0.26.2 is not available for OCaml 5.3.0 ``` --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ada05947688f..dae4bb1f1067 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5894,9 +5894,12 @@ with pkgs; ocamlformat_0_26_1 ; + inherit (ocaml-ng.ocamlPackages_5_2) + ocamlformat_0_26_2 + ; + inherit (ocamlPackages) ocamlformat # latest version - ocamlformat_0_26_2 ocamlformat_0_27_0 ; From c75ae07474065cb55bbbc61eb8d0d8b1d1e3fb54 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 18 Jul 2025 22:28:25 +0200 Subject: [PATCH 2/2] elixir_1_{14,15,16}: fix build with erlang 26 Those throw an error right now and break CI. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dae4bb1f1067..d21303e5387f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6284,10 +6284,13 @@ with pkgs; elixir_1_19 elixir_1_18 elixir_1_17 + elixir-ls + ; + + inherit (beam.packages.erlang_26.beamPackages) elixir_1_16 elixir_1_15 elixir_1_14 - elixir-ls ; inherit (beam.packages.erlang)