summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2017-11-12 09:17:48 -0800
committerJohn Wiegley <johnw@newartisans.com>2017-11-12 09:17:48 -0800
commitdcab51c6f41f74e68e0aa5e2c5e86dd6f8d1fa8d (patch)
treeedea4a1f7c376b9658c8a2927d1d1c6e97f44ac5 /pkgs
parentf1fc74359f815010b4b3055b3a6062af9398e406 (diff)
downloadnixpkgs-dcab51c6f41f74e68e0aa5e2c5e86dd6f8d1fa8d.tar
nixpkgs-dcab51c6f41f74e68e0aa5e2c5e86dd6f8d1fa8d.tar.gz
nixpkgs-dcab51c6f41f74e68e0aa5e2c5e86dd6f8d1fa8d.tar.bz2
nixpkgs-dcab51c6f41f74e68e0aa5e2c5e86dd6f8d1fa8d.tar.lz
nixpkgs-dcab51c6f41f74e68e0aa5e2c5e86dd6f8d1fa8d.tar.xz
nixpkgs-dcab51c6f41f74e68e0aa5e2c5e86dd6f8d1fa8d.tar.zst
nixpkgs-dcab51c6f41f74e68e0aa5e2c5e86dd6f8d1fa8d.zip
coqPackages.QuickChick: Update build for Coq 8.6 and 8.7
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/coq-modules/QuickChick/default.nix20
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index af509dee29c..af7ef8001d3 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -15,9 +15,15 @@ let param =
     };
 
     "8.6" = {
-      version = "20170616";
-      rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a";
-      sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9";
+      version = "20171102";
+      rev = "0fdb769e1dc87a278383b44a9f5102cc7ccbafcf";
+      sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
+    };
+
+    "8.7" = {
+      version = "20171102";
+      rev = "ddf746809c211fa7edfdbfe459d5a7e1cca47a44";
+      sha256 = "0jg3x0w8p088b8369qx492hjpq09f9h2i0li6ph3pny6hdkpdzsi";
     };
 
   }."${coq.coq-version}"
@@ -32,12 +38,14 @@ stdenv.mkDerivation rec {
     inherit (param) rev sha256;
   };
 
-  buildInputs = [ coq.ocaml coq.camlp5 ];
+  buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
   propagatedBuildInputs = [ coq ssreflect ];
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
 
-  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+  installPhase = ''
+    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+  '';
 
   meta = with stdenv.lib; {
     homepage = git://github.com/QuickChick/QuickChick.git;