coqPackages.mathcomp: 1.6.4 -> 1.7.0

This commit is contained in:
Vincent Laporte 2018-04-24 14:21:21 +00:00 committed by Vincent Laporte
parent 2001b57a25
commit b4d0647752
7 changed files with 41 additions and 33 deletions

View file

@ -24,6 +24,9 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms;
};
passthru = { inherit (mathcomp) compatibleCoqVersions; };
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
};
}

View file

@ -23,6 +23,8 @@ stdenv.mkDerivation {
inherit (coq.meta) platforms;
};
passthru = { inherit (ssreflect) compatibleCoqVersions; };
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
};
}

View file

@ -25,6 +25,9 @@ stdenv.mkDerivation {
platforms = coq.meta.platforms;
};
passthru = { inherit (mathcomp) compatibleCoqVersions; };
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
};
}

View file

@ -1,29 +1,29 @@
{ callPackage, fetchurl, coq }:
let param =
let param_1_7 = {
version = "1.7.0";
sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39";
}; in
{
"8.5" = {
version = "1.6.1";
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
};
"8.6" = {
version = "1.6.4";
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
};
"8.7" = {
version = "1.6.4";
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
};
"8.6" = param_1_7;
"8.7" = param_1_7;
"8.8" = param_1_7;
}."${coq.coq-version}"
; in
callPackage ./generic.nix {
name = "coq${coq.coq-version}-mathcomp-${param.version}";
src = fetchurl { inherit (param) url sha256; };
src = fetchurl {
url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
inherit (param) sha256;
};
}

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation {
buildFlags = stdenv.lib.optionalString withDoc "doc";
preBuild = ''
patchShebangs etc/utils/ssrcoqdep
patchShebangs etc/utils/ssrcoqdep || true
cd mathcomp
export COQBIN=${coq}/bin/
'';
@ -36,7 +36,7 @@ stdenv.mkDerivation {
};
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
};
}

View file

@ -1,29 +1,29 @@
{ callPackage, fetchurl, coq }:
let param =
let param_1_7 = {
version = "1.7.0";
sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39";
}; in
{
"8.5" = {
version = "1.6.1";
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
};
"8.6" = {
version = "1.6.4";
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
};
"8.7" = {
version = "1.6.4";
url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
};
"8.6" = param_1_7;
"8.7" = param_1_7;
"8.8" = param_1_7;
}."${coq.coq-version}"
; in
callPackage ./generic.nix {
name = "coq${coq.coq-version}-ssreflect-${param.version}";
src = fetchurl { inherit (param) url sha256; };
src = fetchurl {
url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
inherit (param) sha256;
};
}

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation {
inherit patches;
preBuild = ''
patchShebangs etc/utils/ssrcoqdep
patchShebangs etc/utils/ssrcoqdep || true
cd mathcomp/ssreflect
export COQBIN=${coq}/bin/
'';
@ -43,7 +43,7 @@ stdenv.mkDerivation {
};
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
};
}