Merge commit '373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c'

3 files changed, 19 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
index 96954eb43ace..ee1aeb1503e0 100644
--- a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
@@ -21,9 +21,9 @@ let params =
     };
     "8.8" = rec {
       preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
-      version = "1.0.2";
-      rev = "v${version}";
-      sha256 = "1mcbsp07ra3gdcmir36pf27ig3xv8nagyfp7w5pwqi4gj9w81ffn";
+      version = "20190311";
+      rev = "22af9e9a223d0038f05638654422e637e863b355";
+      sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
       buildInputs = with coq.ocamlPackages; [ ocamlbuild num ];
       propagatedBuildInputs = [ coq-ext-lib simple-io ];
     };
diff --git a/nixpkgs/pkgs/development/coq-modules/contribs/default.nix b/nixpkgs/pkgs/development/coq-modules/contribs/default.nix
index 596c1cd07d3d..faf7db09ff9b 100644
--- a/nixpkgs/pkgs/development/coq-modules/contribs/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/contribs/default.nix
@@ -14,7 +14,9 @@ let mkContrib = repo: revs: param:
 
     buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
 
-    installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+    installFlags =
+       stdenv.lib.optional (stdenv.lib.versionAtLeast coq.coq-version "8.9") "-f Makefile.coq"
+    ++ [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
 
     passthru = {
       compatibleCoqVersions = v: builtins.elem v revs;
@@ -196,7 +198,7 @@ let mkContrib = repo: revs: param:
     sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33";
   };
 
-  containers = mkContrib "containers" [ "8.6" "8.7" "8.8" ] {
+  containers = mkContrib "containers" [ "8.6" "8.7" "8.8" "8.9" ] {
     "8.6" = {
       version = "8.6.0";
       rev = "fa1fec7";
@@ -212,6 +214,11 @@ let mkContrib = repo: revs: param:
       rev = "52b86bed1671321b25fe4d7495558f9f221b12aa";
       sha256 = "0hbnrwdgryr52170cfrlbiymr88jsyxilnpr343vnprqq3zk1xz0";
     };
+    "8.9" = {
+      version = "20190222";
+      rev = "aa33052c1edfc5a65885942a67c2773b5d96f8cc";
+      sha256 = "0mjgfdr9bzsch0dlk4vq1frkaig14dqh46r54cv0l15flxapg0iw";
+    };
   }."${coq.coq-version}";
 
   continuations = mkContrib "continuations" [ ] {
diff --git a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
index b945e7c9a866..6ed343952f21 100644
--- a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchFromGitHub, coq }:
+{ stdenv, fetchFromGitHub, coq, coq-ext-lib }:
 
 stdenv.mkDerivation rec {
-  version = "0.2";
+  version = "1.0.0";
   name = "coq${coq.coq-version}-simple-io-${version}";
   src = fetchFromGitHub {
     owner = "Lysxia";
     repo = "coq-simple-io";
     rev = version;
-    sha256 = "1sbcf57gn134risiicpbxsf4kbzdq7klfn4vn8525kahlr82l65f";
+    sha256 = "06gnbl8chv6ig18rlxnp8gg0np6863kxd7j15h46q0v1cnpx84lp";
   };
 
   buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
 
-  doCheck = !stdenv.lib.versionAtLeast coq.coq-version "8.9";
+  propagatedBuildInputs = [ coq-ext-lib ];
+
+  doCheck = true;
   checkTarget = "test";
 
   installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.7";
   };
 
 }