From 5728b8d4e6f9d0ec2c2f5f843781b4626fe948c8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 6 Oct 2017 20:24:49 +0000
Subject: coqPackages.coquelicot: 2.1.2 -> 3.0.1 coqPackages.interval: 3.1.1 ->
 3.3.0

---
 pkgs/development/coq-modules/coquelicot/default.nix | 12 ++++++------
 pkgs/development/coq-modules/interval/default.nix   | 18 +++++++++++++++---
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'pkgs/development/coq-modules')

diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index a81b76849bce..6f58c387586a 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -7,15 +7,15 @@ let param =
     url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz;
     sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km";
   };
-  v2_1_2 = {
-    version = "2.1.2";
-    url = https://gforge.inria.fr/frs/download.php/file/36320/coquelicot-2.1.2.tar.gz;
-    sha256 = "09q9xbzyndx8i68hn3ir4pmzgqd1q33qpk3xghf2l849g8w3q5an";
+  v3_0_1 = {
+    version = "3.0.1";
+    url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz";
+    sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r";
   };
   in {
   "8.4" = v2_1_1;
-  "8.5" = v2_1_2;
-  "8.6" = v2_1_2;
+  "8.5" = v3_0_1;
+  "8.6" = v3_0_1;
 }."${coq.coq-version}"; in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index c3169970ad24..a8d3f9ad144c 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -1,11 +1,23 @@
 { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }:
 
+let param =
+  if stdenv.lib.versionAtLeast coq.coq-version "8.5"
+  then {
+    version = "3.3.0";
+    url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz";
+    sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903";
+  } else {
+    version = "3.1.1";
+    url = "https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz";
+    sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3";
+  };
+in
+
 stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-interval-3.1.1";
+  name = "coq${coq.coq-version}-interval-${param.version}";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz;
-    sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3";
+    inherit (param) url sha256;
   };
 
   nativeBuildInputs = [ which ];
-- 
cgit 1.4.1