@@ -1,24 +1,24 @@
1−{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, rlwrap, makeDesktopItem }:
1+{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, veriT, rlwrap, makeDesktopItem }:
22# nettools needed for hostname
33
44stdenv.mkDerivation rec {
55 pname = "isabelle";
6− version = "2021";
6+ version = "2021-1";
77
88 dirname = "Isabelle${version}";
99
1010 src = if stdenv.isDarwin
1111 then fetchurl {
1212 url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz";
13− sha256 = "1c2qm2ksmpyxyccyyn4lyj2wqj5m74nz2i0c5abrd1hj45zcnh1m";
13+ sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc";
1414 }
1515 else fetchurl {
1616 url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
17− sha256 = "1isgc9w4q95638dcag9gxz1kmf97pkin3jz1dm2lhd64b2k12y2x";
17+ sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i";
1818 };
1919
2020 nativeBuildInputs = [ makeWrapper ];
21− buildInputs = [ perl polyml z3 ]
21+ buildInputs = [ perl polyml z3 veriT ]
2222 ++ lib.optionals (!stdenv.isDarwin) [ nettools java ];
2323
2424 sourceRoot = dirname;
@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
3333 Z3_INSTALLED=yes
3434 EOF
3535
36+ cat >contrib/verit-*/etc/settings <<EOF
37+ ISABELLE_VERIT=${veriT}/bin/veriT
38+ EOF
39+
3640 cat >contrib/polyml-*/etc/settings <<EOF
3741 ML_SYSTEM_64=true
3842 ML_SYSTEM=${polyml.name}
@@ -52,7 +56,7 @@ stdenv.mkDerivation rec {
5256
5357 echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
5458
55− for comp in contrib/jdk* contrib/polyml-* contrib/z3-*; do
59+ for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-*; do
5660 rm -rf $comp/x86*
5761 done
5862 '' + (if ! stdenv.isLinux then "" else ''
@@ -75,8 +79,6 @@ stdenv.mkDerivation rec {
7579 # desktop item
7680 mkdir -p "$out/share"
7781 cp -r "${desktopItem}/share/applications" "$out/share/applications"
78−
79− wrapProgram $out/$dirname/src/HOL/Tools/ATP/scripts/remote_atp --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.LWP ]}
8082 '';
8183
8284 desktopItem = makeDesktopItem {