ocamlPackages.qcheck: 0.25 → 0.27

pkgs/development/ocaml-modules/containers/default.nix

@@ -1,8 +1,8 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   buildDunePackage,
-  ocaml,
   dune-configurator,
   either,
   seq,
@@ -13,19 +13,25 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "3.16";
   pname = "containers";
 
-  minimalOCamlVersion = "4.08";
-
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-containers";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-WaHAZRLjaEJUba/I2r3Yof/iUqA3PFUuVbzm88izG1k=";
   };
 
+  patches = [
+    # Compatibility with qcheck ≥ 0.26
+    (fetchpatch {
+      url = "https://github.com/c-cube/ocaml-containers/commit/3b49ad2a4e8cfe366d0588e1940d626f0e1b8a2d.patch";
+      hash = "sha256-LFe+LtpBBrf82SX57b4iQSvfd9tSXmnfhffjvjcfLpg=";
+    })
+  ];
+
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [
     either
@@ -40,7 +46,7 @@ buildDunePackage rec {
     yojson
   ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
 
   meta = {
     homepage = "https://github.com/c-cube/ocaml-containers";
@@ -57,4 +63,4 @@ buildDunePackage rec {
     '';
     license = lib.licenses.bsd2;
   };
-}
+})

pkgs/development/ocaml-modules/qcheck/alcotest.nix

@@ -7,7 +7,7 @@
 buildDunePackage {
   pname = "qcheck-alcotest";
 
-  inherit (qcheck-core) version src patches;
+  inherit (qcheck-core) version src;
 
   propagatedBuildInputs = [
     qcheck-core

pkgs/development/ocaml-modules/qcheck/core.nix

@@ -2,21 +2,23 @@
   lib,
   buildDunePackage,
   fetchFromGitHub,
+  alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "qcheck-core";
-  version = "0.25";
+  version = "0.27";
-
-  minimalOCamlVersion = "4.08";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "qcheck";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
-    hash = "sha256-Z89jJ21zm89wb9m5HthnbHdnE9iXLyaH9k8S+FAWkKQ=";
+    hash = "sha256-UfBfFVSvDeVPUakj2GQCRy5G5IZBxrgdceYtj+VAYbg=";
   };
 
+  doCheck = true;
+  checkInputs = [ alcotest ];
+
   meta = {
     description = "Core qcheck library";
     homepage = "https://c-cube.github.io/qcheck/";
@@ -24,4 +26,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})

pkgs/development/ocaml-modules/qcheck/ounit.nix

@@ -7,7 +7,7 @@
 buildDunePackage {
   pname = "qcheck-ounit";
 
-  inherit (qcheck-core) version src patches;
+  inherit (qcheck-core) version src;
 
   propagatedBuildInputs = [
     qcheck-core