diff --git a/pkgs/development/ocaml-modules/domainslib/default.nix b/pkgs/development/ocaml-modules/domainslib/default.nix index 096ba5434996..e912cfeb57af 100644 --- a/pkgs/development/ocaml-modules/domainslib/default.nix +++ b/pkgs/development/ocaml-modules/domainslib/default.nix @@ -29,5 +29,6 @@ buildDunePackage rec { description = "Nested-parallel programming"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; + broken = true; # Not compatible with saturn > 0.4.0 }; } diff --git a/pkgs/development/ocaml-modules/saturn/default.nix b/pkgs/development/ocaml-modules/saturn/default.nix index 582f0e7f5aea..d5b8d0478f2a 100644 --- a/pkgs/development/ocaml-modules/saturn/default.nix +++ b/pkgs/development/ocaml-modules/saturn/default.nix @@ -1,6 +1,8 @@ { lib, buildDunePackage, ocaml , saturn_lockfree +, domain_shims , dscheck +, multicore-bench , qcheck, qcheck-alcotest, qcheck-stm }: @@ -12,7 +14,14 @@ buildDunePackage rec { propagatedBuildInputs = [ saturn_lockfree ]; doCheck = lib.versionAtLeast ocaml.version "5.0"; - checkInputs = [ dscheck qcheck qcheck-alcotest qcheck-stm ]; + checkInputs = [ + domain_shims + dscheck + multicore-bench + qcheck + qcheck-alcotest + qcheck-stm + ]; meta = saturn_lockfree.meta // { description = "Parallelism-safe data structures for multicore OCaml"; diff --git a/pkgs/development/ocaml-modules/saturn/lockfree.nix b/pkgs/development/ocaml-modules/saturn/lockfree.nix index 42858626e58d..07b8dc785cff 100644 --- a/pkgs/development/ocaml-modules/saturn/lockfree.nix +++ b/pkgs/development/ocaml-modules/saturn/lockfree.nix @@ -1,19 +1,19 @@ { lib, fetchurl, buildDunePackage -, domain_shims +, backoff, multicore-magic }: buildDunePackage rec { pname = "saturn_lockfree"; - version = "0.4.0"; + version = "0.5.0"; - minimalOCamlVersion = "4.12"; + minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/ocaml-multicore/saturn/releases/download/${version}/saturn-${version}.tbz"; - hash = "sha256-fHvslaJwVbQaqDVA/MHGqHybetYbxRGlMrhgXqM3iPs="; + hash = "sha256-ZmmxwIe5PiPYTTdvOHbOjRbv2b/bb9y0IekByfREPjk="; }; - propagatedBuildInputs = [ domain_shims ]; + propagatedBuildInputs = [ backoff multicore-magic ]; meta = { description = "Lock-free data structures for multicore OCaml";