From 4bccad99646094d2b8bc78a4c4e126503f82fdb3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 17 Oct 2023 07:02:48 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.core:=20mark=20version=200.15=20a?= =?UTF-8?q?s=20broken=20for=20OCaml=20=E2=89=A5=205.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.15.nix | 2 ++ pkgs/top-level/ocaml-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index f9612c0c011d..ccd2d4eab299 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -3,6 +3,7 @@ , fetchpatch , fzf , lib +, ocaml , openssl , zstd }: @@ -264,6 +265,7 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; doCheck = false; # circular dependency with core_kernel + meta.broken = lib.versionAtLeast ocaml.version "5.1"; }; core_bench = janePackage { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 872e67262a57..01010c77061b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -742,7 +742,7 @@ let } else if lib.versionOlder "4.10.2" ocaml.version then import ../development/ocaml-modules/janestreet/0.15.nix { - inherit self; + inherit self ocaml; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; } else if lib.versionOlder "4.08" ocaml.version @@ -794,6 +794,7 @@ let janeStreet = import ../development/ocaml-modules/janestreet/0.15.nix { self = self' // jsDeps; + inherit ocaml; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; };