From 80e35e85394cb6dab6cb6ee964e3567b107ddbf7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Oct 2025 02:15:17 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.ppx=5Ftyped=5Ffields:=200.17.0=20?= =?UTF-8?q?=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 | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 23443f5553f9..0b3514ea3486 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -1759,17 +1759,29 @@ with self; ) ); - ppx_typed_fields = janePackage { - pname = "ppx_typed_fields"; - hash = "sha256-aTPEBBc1zniZkEmzubGkU064bwGnefBOjVDqTdPm2w8="; - meta.description = "GADT-based field accessors and utilities"; - propagatedBuildInputs = [ - core - ppx_jane - ppxlib - ]; - meta.broken = lib.versionAtLeast ppxlib.version "0.36"; - }; + ppx_typed_fields = janePackage ( + { + pname = "ppx_typed_fields"; + meta.description = "GADT-based field accessors and utilities"; + propagatedBuildInputs = [ + core + ppx_jane + ppxlib + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-M+UhZst98gRg6pVg828UZn8AEFK2a/KAzGkuUkWoBaI="; + } + else + { + version = "0.17.0"; + hash = "sha256-aTPEBBc1zniZkEmzubGkU064bwGnefBOjVDqTdPm2w8="; + } + ) + ); ppx_typerep_conv = janePackage ( {