Update and fix LEO2 prover

This commit is contained in:
Michael Raskin 2014-08-12 03:57:40 +04:00
parent 66858833e3
commit f1f0f0cf19
2 changed files with 18 additions and 10 deletions

View File

@ -1,5 +1,5 @@
x@{builderDefsPackage x@{builderDefsPackage
, ocaml, eprover , ocaml, eprover, zlib
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :
@ -11,16 +11,16 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec { sourceInfo = rec {
baseName="leo2"; baseName="leo2";
version="1.2.8"; version = "1.6.2";
name="${baseName}_v${version}"; name="${baseName}_v${version}";
url="http://www.ags.uni-sb.de/~leo/${name}.tgz"; url="page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz";
hash="d46a94f5991623386eb9061cfb0d748e258359a8c690fded173d45303e0e9e3a"; hash="d46a94f5991623386eb9061cfb0d748e258359a8c690fded173d35303e0e9e3a";
}; };
in in
rec { rec {
src = a.fetchurl { src = a.fetchurl {
url = sourceInfo.url; url = sourceInfo.url;
sha256 = sourceInfo.hash; sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv";
}; };
name = "${sourceInfo.baseName}-${sourceInfo.version}"; name = "${sourceInfo.baseName}-${sourceInfo.version}";
@ -43,6 +43,10 @@ rec {
echo -e "e = ${eprover}/bin/eprover\\nepclextract = ${eprover}/bin/epclextract" > "$out/etc/leoatprc" echo -e "e = ${eprover}/bin/eprover\\nepclextract = ${eprover}/bin/epclextract" > "$out/etc/leoatprc"
'') ["minInit" "doMake" "defEnsureDir"]; '') ["minInit" "doMake" "defEnsureDir"];
makeFlags = [
"SHELL=${a.stdenv.shell}"
];
meta = { meta = {
description = "A high-performance typed higher order prover"; description = "A high-performance typed higher order prover";
maintainers = with a.lib.maintainers; maintainers = with a.lib.maintainers;
@ -52,11 +56,9 @@ rec {
platforms = with a.lib.platforms; platforms = with a.lib.platforms;
linux; linux;
license = "BSD"; license = "BSD";
}; inherit (sourceInfo) version;
passthru = { homepage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/";
updateInfo = { downloadPage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html";
downloadPage = "http://www.ags.uni-sb.de/~leo/download.html";
};
}; };
}) x }) x

View File

@ -0,0 +1,6 @@
url http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html
version_link '[.]tgz'
version '.*_v([0-9.]+)[.][a-z0-9]+$' '\1'
do_overwrite () {
do_overwrite_just_version
}