diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-10-17 07:02:48 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2023-10-24 08:52:15 +0200 |
| commit | 4bccad99646094d2b8bc78a4c4e126503f82fdb3 (patch) | |
| tree | c8b34591b88d6b450580d6589f2c36ae798717f1 | |
| parent | 8ecf5abf794ab364b739df456bbcec41f7fa95aa (diff) | |
| download | nixpkgs-4bccad99646094d2b8bc78a4c4e126503f82fdb3.tar nixpkgs-4bccad99646094d2b8bc78a4c4e126503f82fdb3.tar.gz nixpkgs-4bccad99646094d2b8bc78a4c4e126503f82fdb3.tar.bz2 nixpkgs-4bccad99646094d2b8bc78a4c4e126503f82fdb3.tar.lz nixpkgs-4bccad99646094d2b8bc78a4c4e126503f82fdb3.tar.xz nixpkgs-4bccad99646094d2b8bc78a4c4e126503f82fdb3.tar.zst nixpkgs-4bccad99646094d2b8bc78a4c4e126503f82fdb3.zip | |
ocamlPackages.core: mark version 0.15 as broken for OCaml ≥ 5.1
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/0.15.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index f9612c0c011..ccd2d4eab29 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 872e67262a5..01010c77061 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; }; |