ocamlPackages.qcheck: 0.24 → 0.25

ocamlPackages.ppx_deriving_qcheck: keep at 0.6

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

@@ -9,8 +9,6 @@ buildDunePackage {
 
   inherit (qcheck-core) version src patches;
 
-  duneVersion = "3";
-
   propagatedBuildInputs = [
     qcheck-core
     alcotest

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

@@ -6,15 +6,15 @@
 
 buildDunePackage rec {
   pname = "qcheck-core";
-  version = "0.24";
+  version = "0.25";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "qcheck";
-    rev = "v${version}";
-    hash = "sha256-iuFlmSeUhumeWhqHlaNqDjReRf8c4e76hhT27DK3+/g=";
+    tag = "v${version}";
+    hash = "sha256-Z89jJ21zm89wb9m5HthnbHdnE9iXLyaH9k8S+FAWkKQ=";
   };
 
   meta = {

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

@@ -5,8 +5,6 @@ buildDunePackage {
 
   inherit (qcheck-ounit) version src patches;
 
-  duneVersion = "3";
-
   propagatedBuildInputs = [ qcheck-ounit ];
 
   meta = qcheck-ounit.meta // {

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

@@ -1,7 +1,7 @@
 {
   buildDunePackage,
   qcheck-core,
-  ounit,
+  ounit2,
 }:
 
 buildDunePackage {
@@ -9,11 +9,9 @@ buildDunePackage {
 
   inherit (qcheck-core) version src patches;
 
-  duneVersion = "3";
-
   propagatedBuildInputs = [
     qcheck-core
-    ounit
+    ounit2
   ];
 
   meta = qcheck-core.meta // {

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

@@ -1,6 +1,6 @@
 {
   buildDunePackage,
-  qcheck-core,
+  fetchFromGitHub,
   qcheck,
   ppxlib,
   ppx_deriving,
@@ -8,10 +8,14 @@
 
 buildDunePackage {
   pname = "ppx_deriving_qcheck";
+  version = "0.6";
 
-  inherit (qcheck-core) version src patches;
-
-  duneVersion = "3";
+  src = fetchFromGitHub {
+    owner = "c-cube";
+    repo = "qcheck";
+    tag = "v0.24";
+    hash = "sha256-iuFlmSeUhumeWhqHlaNqDjReRf8c4e76hhT27DK3+/g=";
+  };
 
   propagatedBuildInputs = [
     qcheck
@@ -19,7 +23,7 @@ buildDunePackage {
     ppx_deriving
   ];
 
-  meta = qcheck-core.meta // {
+  meta = qcheck.meta // {
     description = "PPX Deriver for QCheck";
   };
 }