From 4888bfecc28c0b74a18351a08cce5618c5b54868 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 22 Dec 2016 10:34:56 -0800
Subject: coq_8_6: 8.6 is now default, 8.4 optional, updated mathcomp/ssreflect

Addresses #14829
---
 pkgs/development/coq-modules/mathcomp/default.nix  | 45 ++++++++++++++--------
 pkgs/development/coq-modules/mathcomp/generic.nix  |  5 +--
 pkgs/development/coq-modules/ssreflect/default.nix | 14 +++++++
 pkgs/development/coq-modules/ssreflect/generic.nix |  5 +--
 4 files changed, 48 insertions(+), 21 deletions(-)

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

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 189b1220640..81cfdecdfff 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,24 +1,39 @@
-{ callPackage, coq, fetchurl }:
+{ callPackage, fetchurl, coq }:
 
-let src = 
-  if coq.coq-version == "8.4" then
+if coq.coq-version == "8.4" then
 
-    fetchurl {
-      url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-      sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-    }
+callPackage ./generic.nix {
+
+  name = "coq-mathcomp-1.6-${coq.coq-version}";
+  src = fetchurl {
+    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
+    sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
+  };
+
+}
+
+else if coq.coq-version == "8.5" then
 
-  else if coq.coq-version == "8.5" then
+callPackage ./generic.nix {
 
-    fetchurl {
-      url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-      sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-    }
+  name = "coq-mathcomp-1.6-${coq.coq-version}";
+  src = fetchurl {
+    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
+    sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
+  };
 
-  else throw "No mathcomp package for Coq version ${coq.coq-version}";
+}
 
-in
+else if coq.coq-version == "8.6" then
 
 callPackage ./generic.nix {
-  inherit src;
+
+  name = "coq-mathcomp-1.6.1-${coq.coq-version}";
+  src = fetchurl {
+    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
+    sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
+  };
+
 }
+
+else throw "No ssreflect package for Coq version ${coq.coq-version}"
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index b257c81e85f..9a6a98609d2 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, coq, ssreflect, ncurses, which
 , graphviz, ocamlPackages, withDoc ? false
-, src
+, src, name
 }:
 
 stdenv.mkDerivation {
 
-  name = "coq-mathcomp-1.6-${coq.coq-version}";
-
+  inherit name;
   inherit src;
 
   nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 8ba49d06bae..16147c4dc2a 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -4,6 +4,7 @@ if coq.coq-version == "8.4" then
 
 callPackage ./generic.nix {
 
+  name = "coq-ssreflect-1.6-${coq.coq-version}";
   src = fetchurl {
     url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
     sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
@@ -15,6 +16,7 @@ else if coq.coq-version == "8.5" then
 
 callPackage ./generic.nix {
 
+  name = "coq-ssreflect-1.6-${coq.coq-version}";
   src = fetchurl {
     url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
     sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
@@ -22,4 +24,16 @@ callPackage ./generic.nix {
 
 }
 
+else if coq.coq-version == "8.6" then
+
+callPackage ./generic.nix {
+
+  name = "coq-ssreflect-1.6.1-${coq.coq-version}";
+  src = fetchurl {
+    url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
+    sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
+  };
+
+}
+
 else throw "No ssreflect package for Coq version ${coq.coq-version}"
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
index 891a4e2885a..3362e8839a7 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, coq, ncurses, which
 , graphviz, withDoc ? false
-, src, patches ? []
+, src, name, patches ? []
 }:
 
 stdenv.mkDerivation {
 
-  name = "coq-ssreflect-1.6-${coq.coq-version}";
-
+  inherit name;
   inherit src;
 
   nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
-- 
cgit 1.4.1