From 3f37b38accd1e7688baaaecd1fa2c729761dc1fc Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Tue, 3 Dec 2024 21:10:47 +0100 Subject: [PATCH] ocamlformat: Build on OCaml 4.14 (#361404) * ocamlformat: Build on OCaml 4.14 OCamlformat fails to build since the bump to OCaml 5.2 in https://github.com/NixOS/nixpkgs/pull/346071 error: ocamlformat 0.26.1 is not available for OCaml 5.2.1 This changes which version of the compiler is used to build OCamlformat. 4.14 is used to increase sharing when several versions of the tool are used at the same time. This will not change OCamlformat's behaviors. * ocamlformat_0_26_2: Build on the latest compiler (cherry picked from commit 8d3033ab45ee165a89ba7cd8a99af571197940fb) --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 309df301020f8..af21457cdbfe2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6863,12 +6863,12 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_14) ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4; + ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 + ocamlformat_0_26_0 ocamlformat_0_26_1; inherit (ocamlPackages) ocamlformat # latest version - ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 ocamlformat_0_26_0 - ocamlformat_0_26_1 ocamlformat_0_26_2; + ocamlformat_0_26_2; inherit (ocamlPackages) odig;