public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coqPackages.{ssreflect,mathcomp}: fix build with Coq-8.6

Browse Source 
by adding `findlib` as a build input.

Also clean `default.nix` a little bit.
This commit is contained in:
Vincent Laporte 2017-01-25 07:41:25 +00:00
parent 635ac15845
commit 42bf99ef44
4 changed files with 31 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/development/coq-modules/mathcomp/default.nix
View File

@ -1,39 +1,22 @@
{ callPackage, fetchurl, coq }: { callPackage, fetchurl, coq }:
if coq.coq-version == "8.4" then let param =
let v16 = {
callPackage ./generic.nix { version = "1.6";
name = "coq-mathcomp-1.6-${coq.coq-version}";
src = fetchurl {
url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
}; }; v161 = {
version = "1.6.1";
}
else if coq.coq-version == "8.5" then
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.6" then
callPackage ./generic.nix {
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; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
}; }; in
{
"8.4" = v16;
"8.5" = v16;
"8.6" = v161;
}."${coq.coq-version}"; in
callPackage ./generic.nix {
name = "coq${coq.coq-version}-mathcomp-${param.version}";
src = fetchurl { inherit (param) url sha256; };
} }
else throw "No ssreflect package for Coq version ${coq.coq-version}"

4
pkgs/development/coq-modules/mathcomp/generic.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, coq, ssreflect, ncurses, which { stdenv, fetchurl, coq, ssreflect, ncurses, which
, graphviz, ocamlPackages, withDoc ? false , graphviz, withDoc ? false
, src, name , src, name
}: }:
@ -9,7 +9,7 @@ stdenv.mkDerivation {
inherit src; inherit src;
nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
buildInputs = [ coq.ocaml coq.camlp5 ncurses which ]; buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
propagatedBuildInputs = [ coq ssreflect ]; propagatedBuildInputs = [ coq ssreflect ];
enableParallelBuilding = true; enableParallelBuilding = true;

45
pkgs/development/coq-modules/ssreflect/default.nix
View File

@ -1,39 +1,22 @@
{ callPackage, fetchurl, coq }: { callPackage, fetchurl, coq }:
if coq.coq-version == "8.4" then let param =
let v16 = {
callPackage ./generic.nix { version = "1.6";
name = "coq-ssreflect-1.6-${coq.coq-version}";
src = fetchurl {
url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
}; }; v161 = {
version = "1.6.1";
}
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";
};
}
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; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
}; }; in
{
"8.4" = v16;
"8.5" = v16;
"8.6" = v161;
}."${coq.coq-version}"; in
callPackage ./generic.nix {
name = "coq${coq.coq-version}-ssreflect-${param.version}";
src = fetchurl { inherit (param) url sha256; };
} }
else throw "No ssreflect package for Coq version ${coq.coq-version}"

2
pkgs/development/coq-modules/ssreflect/generic.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation {
inherit src; inherit src;
nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
buildInputs = [ coq.ocaml coq.camlp5 ncurses which ]; buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
enableParallelBuilding = true; enableParallelBuilding = true;