diff --git a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix index 61a484a7f54b..6063638edd6e 100644 --- a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix +++ b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "isabelle-linter"; - version = "2024-1.0.1"; + version = "2025-1.0.0"; src = fetchFromGitHub { owner = "isabelle-prover"; repo = "isabelle-linter"; - rev = "Isabelle2024-v1.0.1"; - hash = "sha256-oTrwcfJgbkpkIweDIyc6lZjAvdS9J4agPoJgZzH+PuQ="; + rev = "Isabelle2025-v1.0.0"; + hash = "sha256-cH9EoIbKa6cqLjw83gnYvCy+Dq0d5fFmJCabdPrRJeI="; }; nativeBuildInputs = [ isabelle ]; diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index c8f5d1306e5b..363bf860b8c9 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchFromGitHub, coreutils, nettools, java, @@ -10,7 +11,6 @@ veriT, vampire, eprover-ho, - naproche, rlwrap, perl, procps, @@ -21,6 +21,15 @@ }: let + vampire' = vampire.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "vprover"; + repo = "vampire"; + tag = "v4.8HO4Sledgahammer"; + hash = "sha256-CmppaGa4M9tkE1b25cY1LSPFygJy5yV4kpHKbPqvcVE="; + }; + }); + sha1 = stdenv.mkDerivation { pname = "isabelle-sha1"; version = "2024"; @@ -46,7 +55,7 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "isabelle"; - version = "2024"; + version = "2025"; dirname = "Isabelle${version}"; @@ -54,17 +63,17 @@ stdenv.mkDerivation (finalAttrs: rec { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - hash = "sha256-IgNfmW9x6h8DBj9vFEGV62oEl01NkW7QdyzXlWmii8c="; + hash = "sha256-6ldUwiiFf12dOuJU7JgUeX8kU+opDfILL23LLvDi5/g="; } else if stdenv.hostPlatform.isx86 then fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - hash = "sha256-YDqq+KvqNll687BlHSwWKobAoN1EIHZvR+VyQDljkmc="; + hash = "sha256-PR1m3jcYI/4xqormZjj3NXW6wkTwCzGu4dy2LzgUfFY="; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz"; - hash = "sha256-jXWVv18WwrVnqVX1s4Lnyf7DkOzPa3EdLXYxgtKD+YA="; + hash = "sha256-p/Hp+7J5gJy5s6BVD5Ma1Mu2OS53I8BS7gKSOYYB0PE="; }; nativeBuildInputs = [ java ]; @@ -72,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ polyml veriT - vampire + vampire' eprover-ho nettools ]; @@ -103,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: rec { EOF cat >contrib/vampire-*/etc/settings <>etc/settings for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d59e0d200652..02be3996fe5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18175,19 +18175,13 @@ with pkgs; isabelle = callPackage ../by-name/is/isabelle/package.nix { polyml = polyml.overrideAttrs { pname = "polyml-for-isabelle"; - version = "2024"; + version = "2025"; configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; buildFlags = [ "compiler" ]; - src = fetchFromGitHub { - owner = "polyml"; - repo = "polyml"; - rev = "v5.9.1"; - hash = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; - }; }; java = openjdk21;