diff options
author | Jan van Brügge <supermanitu@gmail.com> | 2021-12-31 13:01:41 +0100 |
---|---|---|
committer | Jan van Brügge <supermanitu@gmail.com> | 2021-12-31 13:01:41 +0100 |
commit | 4b9c0cb00521a63686275427238f9758a04ece96 (patch) | |
tree | 720a3c2730a8821ed769b848d01d03b2b1a9b661 /pkgs/applications/science/logic/isabelle | |
parent | d3e2cf4314a844a289ff167f9b0cb3ad3a7b7dda (diff) | |
download | nixpkgs-4b9c0cb00521a63686275427238f9758a04ece96.tar nixpkgs-4b9c0cb00521a63686275427238f9758a04ece96.tar.gz nixpkgs-4b9c0cb00521a63686275427238f9758a04ece96.tar.bz2 nixpkgs-4b9c0cb00521a63686275427238f9758a04ece96.tar.lz nixpkgs-4b9c0cb00521a63686275427238f9758a04ece96.tar.xz nixpkgs-4b9c0cb00521a63686275427238f9758a04ece96.tar.zst nixpkgs-4b9c0cb00521a63686275427238f9758a04ece96.zip |
isabelle: 2021 -> 2021-1
Diffstat (limited to 'pkgs/applications/science/logic/isabelle')
-rw-r--r-- | pkgs/applications/science/logic/isabelle/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index f9337f69025..e69c76352b9 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, rlwrap, makeDesktopItem }: +{ lib, stdenv, fetchurl, perl, perlPackages, makeWrapper, nettools, java, polyml, z3, veriT, rlwrap, makeDesktopItem }: # nettools needed for hostname stdenv.mkDerivation rec { pname = "isabelle"; - version = "2021"; + version = "2021-1"; dirname = "Isabelle${version}"; src = if stdenv.isDarwin then fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - sha256 = "1c2qm2ksmpyxyccyyn4lyj2wqj5m74nz2i0c5abrd1hj45zcnh1m"; + sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc"; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "1isgc9w4q95638dcag9gxz1kmf97pkin3jz1dm2lhd64b2k12y2x"; + sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl polyml z3 ] + buildInputs = [ perl polyml z3 veriT ] ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname; @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { Z3_INSTALLED=yes EOF + cat >contrib/verit-*/etc/settings <<EOF + ISABELLE_VERIT=${veriT}/bin/veriT + EOF + cat >contrib/polyml-*/etc/settings <<EOF ML_SYSTEM_64=true ML_SYSTEM=${polyml.name} @@ -52,7 +56,7 @@ stdenv.mkDerivation rec { echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings - for comp in contrib/jdk* contrib/polyml-* contrib/z3-*; do + for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-*; do rm -rf $comp/x86* done '' + (if ! stdenv.isLinux then "" else '' @@ -75,8 +79,6 @@ stdenv.mkDerivation rec { # desktop item mkdir -p "$out/share" cp -r "${desktopItem}/share/applications" "$out/share/applications" - - wrapProgram $out/$dirname/src/HOL/Tools/ATP/scripts/remote_atp --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.LWP ]} ''; desktopItem = makeDesktopItem { |