Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'

5 files changed, 28 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix
index 8eaa2bdfae70..9b3b5320c8ed 100644
--- a/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix
@@ -1,7 +1,12 @@
 { stdenv, fetchFromGitHub, coq, Cheerios, InfSeqExt, ssreflect }:
 
 let param =
+  if stdenv.lib.versionAtLeast coq.coq-version "8.7" then
   {
+      version = "20190202";
+      rev = "bc193be9ea8485add7646a0f72e2aa76a9c7e01f";
+      sha256 = "1adkwxnmc9qfah2bya0hpd2vzkmk1y212z4n7fcmvr1a85ykgd7z";
+  } else {
       version = "20181102";
       rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
       sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix
index 8ff9cc5b8303..8c3153712295 100644
--- a/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }:
 
 stdenv.mkDerivation rec {
-  version = "0.1.0";
+  version = "0.2.0";
   name = "coq${coq.coq-version}-mathcomp-analysis-${version}";
 
   src = fetchFromGitHub {
     owner = "math-comp";
     repo = "analysis";
     rev = version;
-    sha256 = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al";
+    sha256 = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd";
   };
 
   buildInputs = [ coq ];
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix
index 18584d28c685..c36b72711ff6 100644
--- a/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix
@@ -1,14 +1,25 @@
 { stdenv, fetchFromGitHub, coq, mathcomp }:
 
+let param =
+  if stdenv.lib.versionAtLeast mathcomp.version "1.8.0"
+  then {
+    version = "1.2.0";
+    sha256 = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4";
+  } else {
+    version = "1.1.0";
+    sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
+  }
+; in
+
 stdenv.mkDerivation rec {
-  version = "1.1.0";
+  inherit (param) version;
   name = "coq${coq.coq-version}-mathcomp-finmap-${version}";
 
   src = fetchFromGitHub {
     owner = "math-comp";
     repo = "finmap";
     rev = version;
-    sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a";
+    inherit (param) sha256;
   };
 
   buildInputs = [ coq ];
diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
index 1e5b6b7bf666..8b4c74fb1a54 100644
--- a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix
@@ -4,7 +4,12 @@
 
 let param =
 
-  if stdenv.lib.versionAtLeast coq.coq-version "8.6" then
+  if stdenv.lib.versionAtLeast coq.coq-version "8.7" then
+  {
+    version = "1.8.0";
+    sha256 = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
+  }
+  else if stdenv.lib.versionAtLeast coq.coq-version "8.6" then
   {
     version = "1.7.0";
     sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
diff --git a/nixpkgs/pkgs/development/coq-modules/tlc/default.nix b/nixpkgs/pkgs/development/coq-modules/tlc/default.nix
index 5a236f59129d..fb966f762bc2 100644
--- a/nixpkgs/pkgs/development/coq-modules/tlc/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/tlc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, coq }:
 
 stdenv.mkDerivation rec {
-  version = "20180316";
+  version = "20181116";
   name = "coq${coq.coq-version}-tlc-${version}";
 
   src = fetchurl {
     url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz";
-    sha256 = "0y8h0x9dfn9dm60j1jkxr9i8lbfqd3ff626wrc9v49qxhi50szqq";
+    sha256 = "0iv6f6zmrv2lhq3xq57ipmw856ahsql754776ymv5wjm88ld63nm";
   };
 
   buildInputs = [ coq ];