From 3db8656e35cbaee20d75556fde4b925016dcc494 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Jan 2026 06:55:50 +0100 Subject: [PATCH 1/3] ocamlPackages.landmarks-ppx: disable tests for OCaml < 5.1 --- pkgs/development/ocaml-modules/landmarks-ppx/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix index 724d8c10c73e..4d70169e2c4f 100644 --- a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix +++ b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix @@ -8,14 +8,13 @@ buildDunePackage { pname = "landmarks-ppx"; - minimalOCamlVersion = "4.08"; inherit (landmarks) src version; buildInputs = [ ppxlib ]; propagatedBuildInputs = [ landmarks ]; - doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder ocaml.version "5.0"; + doCheck = lib.versionAtLeast ocaml.version "5.1"; meta = landmarks.meta // { description = "Preprocessor instrumenting code using the landmarks library"; From 1a440e3d533ff767b13e62d504630f1eca4fceec Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Jan 2026 06:55:55 +0100 Subject: [PATCH 2/3] ocaml-ng.ocamlPackages_4_13.ocaml-lsp: mark as broken --- pkgs/development/ocaml-modules/ocaml-lsp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index fe4d5e5fa1aa..83ca1daffd9e 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -85,5 +85,6 @@ buildDunePackage rec { meta = lsp.meta // { description = "OCaml Language Server Protocol implementation"; mainProgram = "ocamllsp"; + broken = lib.versions.majorMinor ocaml.version == "4.13"; }; } From 0822fae62129767a79f238b293e06dce5e0e735c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Jan 2026 06:56:00 +0100 Subject: [PATCH 3/3] =?UTF-8?q?ocamlPackages.ppxlib:=200.33.0=20=E2=86=92?= =?UTF-8?q?=200.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fl/flow/package.nix | 2 +- pkgs/development/ocaml-modules/ppxlib/default.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix index 2ba10797e23c..281a2fb80862 100644 --- a/pkgs/by-name/fl/flow/package.nix +++ b/pkgs/by-name/fl/flow/package.nix @@ -10,7 +10,7 @@ let ocamlPackages = ocaml-ng.ocamlPackages.overrideScope ( self: super: { - ppxlib = super.ppxlib.override { version = "0.33.0"; }; + ppxlib = super.ppxlib.override { version = "0.34.0"; }; } ); in diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 76aabf9f8194..0d5d2dfb7c15 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -11,7 +11,7 @@ if lib.versionAtLeast ocaml.version "5.03" then if lib.versionAtLeast ocaml.version "5.04" then "0.37.0" else "0.36.2" else - "0.33.0" + "0.34.0" else "0.24.0" else @@ -91,6 +91,9 @@ let sha256 = "sha256-/6RO9VHyO3XiHb1pijAxBDE4Gq8UC5/kuBwucKLSxjo="; min_version = "4.07"; }; + "0.34.0" = { + sha256 = "sha256-132XFloVjXrla3wDh80E6ZJ9fn55fKEDn/tbsXpmYac="; + }; "0.36.2" = { sha256 = "sha256-yHVgB9jKwTeahGEUYQDB1hHH327MGpoKqb3ewNbk5xs="; min_version = "4.08";