coqPackages.QuickChick: init at 1.1.0 for Coq 8.9

Removes QuickChick for Coq 8.7 as it is broken
(probably due to a too recent ssreflect).

1 files changed, 15 insertions, 12 deletions

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index ee1aeb1503e..874b99f2beb 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -14,23 +14,23 @@ let params =
       sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
     };
 
-    "8.7" = {
-      version = "20171212";
-      rev = "195e550a1cf0810497734356437a1720ebb6d744";
-      sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1";
-    };
     "8.8" = rec {
-      preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
       version = "20190311";
       rev = "22af9e9a223d0038f05638654422e637e863b355";
       sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
-      buildInputs = with coq.ocamlPackages; [ ocamlbuild num ];
-      propagatedBuildInputs = [ coq-ext-lib simple-io ];
+    };
+
+    "8.9" = rec {
+      version = "1.1.0";
+      rev = "v${version}";
+      sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
     };
   };
   param = params."${coq.coq-version}";
 in
 
+let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
+
 stdenv.mkDerivation rec {
 
   name = "coq${coq.coq-version}-QuickChick-${param.version}";
@@ -41,16 +41,19 @@ stdenv.mkDerivation rec {
     inherit (param) rev sha256;
   };
 
+  preConfigure = stdenv.lib.optionalString recent
+    "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
+
   buildInputs = [ coq ]
   ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ])
-  ++ (param.buildInputs or [])
+  ++ stdenv.lib.optionals recent
+     (with coq.ocamlPackages; [ ocamlbuild num ])
   ;
-  propagatedBuildInputs = [ ssreflect ] ++ (param.propagatedBuildInputs or []);
+  propagatedBuildInputs = [ ssreflect ]
+  ++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ];
 
   enableParallelBuilding = false;
 
-  preConfigure = param.preConfigure or null;
-
   installPhase = ''
     make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
   '';