From fe80f1a4eba62da1afe7c5613b16aa3a2b7d3ddd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 Oct 2025 19:27:16 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.ppxlib:=200.36.0=20=E2=86=92=200.?= =?UTF-8?q?36.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ppxlib/default.nix | 6 +++--- pkgs/development/ocaml-modules/repr/ppx.nix | 14 ++++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 027532b4a552..f97140fd0e53 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -7,7 +7,7 @@ if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" then if lib.versionAtLeast ocaml.version "4.11" then - if lib.versionAtLeast ocaml.version "5.03" then "0.36.0" else "0.33.0" + if lib.versionAtLeast ocaml.version "5.03" then "0.36.2" else "0.33.0" else "0.24.0" else @@ -87,8 +87,8 @@ let sha256 = "sha256-/6RO9VHyO3XiHb1pijAxBDE4Gq8UC5/kuBwucKLSxjo="; min_version = "4.07"; }; - "0.36.0" = { - sha256 = "sha256-WrobzhTFMQhhQTARDIQ9AEv5O9LPOgd4/XCGuFOQpDQ="; + "0.36.2" = { + sha256 = "sha256-yHVgB9jKwTeahGEUYQDB1hHH327MGpoKqb3ewNbk5xs="; min_version = "4.08"; }; } diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix index c9e7729d86c1..8b1ee472d4e2 100644 --- a/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -14,10 +14,16 @@ buildDunePackage { inherit (repr) src version; - patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { - url = "https://github.com/mirage/repr/commit/9dcaeaa7e5f45998f76e1eab68f8fd18edc980cc.patch"; - hash = "sha256-MKuZ4f8m/nNlgZpomGgqr80s5btynKcb1b4khpIIOY4="; - }); + patches = lib.optionals (lib.versionAtLeast ppxlib.version "0.36") [ + (fetchpatch { + url = "https://github.com/mirage/repr/commit/460fc85a2804e3301bfc0e79413f5df472d95374.patch"; + hash = "sha256-8nEPyeZ1s9Q/6+BKtdMb9kVhTfCdMmRrU3xpvizVZHA="; + }) + (fetchpatch { + url = "https://github.com/mirage/repr/commit/c939a7317e126589bd6d6bd1d9e38cff749bcdb1.patch"; + hash = "sha256-Srf5fZoc0iiJEZiW8PnIM5VdHOGofbdkhfnjQvFcTq0="; + }) + ]; propagatedBuildInputs = [ ppx_deriving