Unverified Commit 64891e36 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #243497 from jvanbruegge/isabelle-2023 

isabelle: 2022 -> 2023
parents 109400fa 3e902936

pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


stdenv.mkDerivation rec {

  pname = "isabelle-linter";

  version = "1.2.1";

  version = "2023-1.0.0";



  src = fetchFromGitHub {

    owner = "isabelle-prover";

    repo = "isabelle-linter";

    rev = "Isabelle2022-v${version}";

    sha256 = "sha256-qlojNCsm3/49TtAVq6J31BbQipdIoDcn71pBotZyquY=";

    rev = "Isabelle2023-v1.0.0";

    sha256 = "sha256-q9+qN94NaTzvhbcNQj7yH/VVfs1QgCH8OU8HW+5+s9U=";

  };



  nativeBuildInputs = [ isabelle ];

pkgs/applications/science/logic/isabelle/default.nix

+5 −6
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ let 
  };

in stdenv.mkDerivation (finalAttrs: rec {

  pname = "isabelle";

  version = "2022";

  version = "2023";



  dirname = "Isabelle${version}";
@@ -56,18 +56,18 @@ in stdenv.mkDerivation (finalAttrs: rec { 
      fetchurl

        {

          url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz";

          sha256 = "0b84rx9b7b5y8m1sg7xdp17j6yngd2dkx6v5bkd8h7ly102lai18";

          sha256 = "sha256-0VSW2SrHNI3/k4cCCZ724ruXaq7W1NCPsLrXFZ9l1/Q=";

        }

    else if stdenv.hostPlatform.isx86

    then

      fetchurl {

        url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";

        sha256 = "1ih4gykkp1an43qdgc5xzyvf30fhs0dah3y0a5ksbmvmjsfnxyp7";

        sha256 = "sha256-Go4ZCsDz5gJ7uWG5VLrNJOddMPX18G99FAadpX53Rqg=";

      }

    else

      fetchurl {

        url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz";

        hash = "sha256-qI/BR/KZwLjnkO5q/yYeW4lN4xyUe78VOM2INC/Z/io=";

        hash = "sha256-Tzxxs0gKw6vymbaXIzH8tK5VgUrpOIp9vcWQ/zxnRCc=";

      };



  nativeBuildInputs = [ java ];
@@ -134,8 +134,7 @@ in stdenv.mkDerivation (finalAttrs: rec { 


    substituteInPlace src/Tools/Setup/src/Environment.java \

      --replace 'cmd.add("/usr/bin/env");' "" \

      --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" \

      --replace 'private static read_file(path: Path): String =' 'private static String read_file(Path path) throws IOException'

      --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");"



    substituteInPlace src/Pure/General/sha1.ML \

      --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"'

pkgs/applications/science/logic/naproche/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


with haskellPackages; mkDerivation {

  pname = "Naproche-SAD";

  version = "2022-10-24";

  version = "unstable-2023-07-11";



  src = fetchFromGitHub {

    owner = "naproche";

    repo = "naproche";

    rev = "c8c4ca2d5fdb92bf17e0e54c99bd2a9691255d80";

    sha256 = "0xvh6kkl5k5ygp2nrbq3k0snvzczbmcp1yrwdkah3fzhf9i3yykx";

    rev = "4c399d49a86987369bec6e1ac5ae3739cd6db0a8";

    sha256 = "sha256-Ji6yxbDEcwuYAzIZwK5sHNltK1WBFBfpyoEtoID/U4k=";

  };



  isExecutable = true;

pkgs/top-level/all-packages.nix

+3 −3
Original line number Diff line number Diff line
@@ -39617,14 +39617,14 @@ with pkgs; 
  isabelle = callPackage ../applications/science/logic/isabelle {

    polyml = polyml.overrideAttrs {

      pname = "polyml-for-isabelle";

      version = "2022";

      version = "2023";

      configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ];

      buildFlags = [ "compiler" ];

      src = fetchFromGitHub {

        owner = "polyml";

        repo = "polyml";

        rev = "bafe319bc3a65bf63bd98a4721a6f4dd9e0eabd6";

        hash = "sha256-gmMQp/J5qGP4HhyW5tnSp3dKxNLEYcRewCwi/H8C+vk=";

        rev = "219e0a248f705b770d45699755d00f05b82a9391";

        hash = "sha256-HtT3MGtHrqVhynmx73L7NC12AW9N7gkkOi7MKbF4k6Y=";

      };

    };