From 0708f349688ab88d89897e7ce91efb20aec6202c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Oct 2025 02:15:05 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.ppx=5Fderive=5Fat=5Fruntime:=200.?= =?UTF-8?q?17.0=20=E2=86=92=200.17.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/janestreet/0.17.nix | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index c7ec05e6b1bf..6e0f48a1d9d1 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -1217,18 +1217,30 @@ with self; ]; }; - ppx_derive_at_runtime = janePackage { - pname = "ppx_derive_at_runtime"; - hash = "sha256-Y/z4BKFRt3z1lUGdc7SznIv/ys//dZHoPSnsouj1GtI="; - meta.description = "Define a new ppx deriver by naming a runtime module"; - propagatedBuildInputs = [ - base - expect_test_helpers_core - ppx_jane - ppxlib - ]; - meta.broken = lib.versionAtLeast ppxlib.version "0.36"; - }; + ppx_derive_at_runtime = janePackage ( + { + pname = "ppx_derive_at_runtime"; + meta.description = "Define a new ppx deriver by naming a runtime module"; + propagatedBuildInputs = [ + base + expect_test_helpers_core + ppx_jane + ppxlib + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-bbUV2t8MhqDCHDJp7fqJTnRrfZdYO8DLnygqQF0+ouY="; + } + else + { + version = "0.17.0"; + hash = "sha256-Y/z4BKFRt3z1lUGdc7SznIv/ys//dZHoPSnsouj1GtI="; + } + ) + ); ppx_diff = janePackage ( {