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

Merge pull request #49780 from Zimmi48/give-default-version-of-ssreflect

Browse Source 
coqPackages.ssreflect: refactor choice of source version
This commit is contained in:
Jörg Thalheim 2018-11-06 15:21:19 +00:00 committed by GitHub
commit 846b2faea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,34 +1,33 @@
{ stdenv, fetchurl, coq, ncurses, which { stdenv, fetchFromGitHub, coq, ncurses, which
, graphviz, withDoc ? false , graphviz, withDoc ? false
}: }:
let params = let param =
let param_1_7 = {
version = "1.7.0";
sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39";
}; in
if stdenv.lib.versionAtLeast coq.coq-version "8.6" then
{ {
"8.5" = { version = "1.7.0";
version = "1.6.1"; sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; }
}; else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then
{
version = "1.6.1";
sha256 = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i";
}
else throw "No version of math-comp is available for Coq ${coq.coq-version}";
"8.6" = param_1_7;
"8.7" = param_1_7;
"8.8" = param_1_7;
"8.9" = param_1_7;
};
param = params."${coq.coq-version}";
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-mathcomp-${param.version}"; name = "coq${coq.coq-version}-mathcomp-${version}";
src = fetchurl { # used in ssreflect
url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz"; inherit (param) version;
src = fetchFromGitHub {
owner = "math-comp";
repo = "math-comp";
rev = "mathcomp-${param.version}";
inherit (param) sha256; inherit (param) sha256;
}; };
@ -39,10 +38,11 @@ stdenv.mkDerivation {
buildFlags = stdenv.lib.optionalString withDoc "doc"; buildFlags = stdenv.lib.optionalString withDoc "doc";
COQBIN = "${coq}/bin/";
preBuild = '' preBuild = ''
patchShebangs etc/utils/ssrcoqdep || true patchShebangs etc/utils/ssrcoqdep || true
cd mathcomp cd mathcomp
export COQBIN=${coq}/bin/
''; '';
installPhase = '' installPhase = ''
@ -59,7 +59,7 @@ stdenv.mkDerivation {
}; };
passthru = { passthru = {
compatibleCoqVersions = v: builtins.hasAttr v params; compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
}; };
} }

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

@ -1,46 +1,22 @@
{ stdenv, fetchurl, coq, ncurses, which { stdenv, fetchFromGitHub, coq, ncurses, which
, graphviz, withDoc ? false , graphviz, mathcomp, withDoc ? false
}: }:
let params = stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-ssreflect-${version}";
let param_1_7 = { inherit (mathcomp) src version meta;
version = "1.7.0";
sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39";
}; in
{
"8.5" = {
version = "1.6.1";
sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
};
"8.6" = param_1_7;
"8.7" = param_1_7;
"8.8" = param_1_7;
"8.9" = param_1_7;
};
param = params."${coq.coq-version}";
in
stdenv.mkDerivation {
name = "coq${coq.coq-version}-ssreflect-${param.version}";
src = fetchurl {
url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
inherit (param) sha256;
};
nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
enableParallelBuilding = true; enableParallelBuilding = true;
COQBIN = "${coq}/bin/";
preBuild = '' preBuild = ''
patchShebangs etc/utils/ssrcoqdep || true patchShebangs etc/utils/ssrcoqdep || true
cd mathcomp/ssreflect cd mathcomp/ssreflect
export COQBIN=${coq}/bin/
''; '';
installPhase = '' installPhase = ''
@ -52,15 +28,5 @@ stdenv.mkDerivation {
cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/ cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
''; '';
meta = with stdenv.lib; { passthru.compatibleCoqVersions = mathcomp.compatibleCoqVersions;
homepage = http://ssr.msr-inria.inria.fr/;
license = licenses.cecill-b;
maintainers = with maintainers; [ vbgl jwiegley ];
inherit (coq.meta) platforms;
};
passthru = {
compatibleCoqVersions = v: builtins.hasAttr v params;
};
} }