summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Wiegley <jwiegley@gmail.com>2017-09-03 13:51:39 -0700
committerGitHub <noreply@github.com>2017-09-03 13:51:39 -0700
commit14d915e3957875b284ce21a599ff74d4bd3ca0c6 (patch)
tree95e7ea2be3753de83e9aae2a0454e1f510fbc78f
parent97935829f6d271ab5cc91a299146cb6a1d903cc4 (diff)
parent9b9d3743cef353e7f3735519c5187bb00fd22ef7 (diff)
downloadnixlib-14d915e3957875b284ce21a599ff74d4bd3ca0c6.tar
nixlib-14d915e3957875b284ce21a599ff74d4bd3ca0c6.tar.gz
nixlib-14d915e3957875b284ce21a599ff74d4bd3ca0c6.tar.bz2
nixlib-14d915e3957875b284ce21a599ff74d4bd3ca0c6.tar.lz
nixlib-14d915e3957875b284ce21a599ff74d4bd3ca0c6.tar.xz
nixlib-14d915e3957875b284ce21a599ff74d4bd3ca0c6.tar.zst
nixlib-14d915e3957875b284ce21a599ff74d4bd3ca0c6.zip
Merge pull request #28902 from vbgl/quickchick
coqPackages.QuickChick: fix
-rw-r--r--pkgs/development/coq-modules/QuickChick/default.nix34
1 files changed, 26 insertions, 8 deletions
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 80cdcfec2879..1ce559b325e7 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -1,20 +1,38 @@
-{stdenv, fetchgit, coq, coqPackages}:
-
-let revision = "ee436635a34873c79f49c3d2d507194216f6e8e9"; in
+{ stdenv, fetchgit, coq, ssreflect }:
+
+let param =
+  {
+    "8.4" = {
+      version = "20160529";
+      rev = "a9e89f1d4246a787bf1d8873072077a319635c3e";
+      sha256 = "14ng71p890q12xvsj00si2a3fjcbsap2gy0r8sxpw4zndnlq74wa";
+    };
+
+    "8.5" = {
+      version = "20170512";
+      rev = "31eb050ae5ce57ab402db9726fb7cd945a0b4d03";
+      sha256 = "033ch10i5wmqyw8j6wnr0dlbnibgfpr1vr0c07q3yj6h23xkmqpg";
+    };
+
+    "8.6" = {
+      version = "20170616";
+      rev = "366ee3f8e599b5cab438a63a09713f44ac544c5a";
+      sha256 = "06kwnrfndnr6w8bmaa2s0i0rkqyv081zj55z3vcyn0wr6x6mlsz9";
+    };
+  }."${coq.coq-version}"
+; in
 
 stdenv.mkDerivation rec {
 
-  name = "coq-QuickChick-${coq.coq-version}-${version}";
-  version = "20170710-${builtins.substring 0 7 revision}";
+  name = "coq${coq.coq-version}-QuickChick-${param.version}";
 
   src = fetchgit {
     url = git://github.com/QuickChick/QuickChick.git;
-    rev = revision;
-    sha256 = "0sq14j1kl4m4plyxj2dbkfwa6iqipmf9w7mxxxcbsm718m0xf1gr";
+    inherit (param) rev sha256;
   };
 
   buildInputs = [ coq.ocaml coq.camlp5 ];
-  propagatedBuildInputs = [ coq coqPackages.ssreflect ];
+  propagatedBuildInputs = [ coq ssreflect ];
 
   enableParallelBuilding = true;