Commit 4bccad99 authored by Vincent Laporte's avatar Vincent Laporte Committed by Vincent Laporte
Browse files

ocamlPackages.core: mark version 0.15 as broken for OCaml ≥ 5.1

parent 8ecf5abf

pkgs/development/ocaml-modules/janestreet/0.15.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 {

pkgs/top-level/ocaml-packages.nix

+2 −1
Original line number Diff line number Diff line
@@ -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;

      };