diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 8c1cedc9ef7d..40547a2f664c 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -8,7 +8,7 @@ rubber, hevea, emacs, - version ? "1.7.2", + version ? "1.8.0", ideSupport ? true, wrapGAppsHook3, }: @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; hash = { + "1.8.0" = "sha256-gDe4OI0AuoYmJSCg/SMRQYcgelX/SM28ClQfKhnw88E="; "1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ="; "1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 257671f33092..c947998b9e58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2222,7 +2222,11 @@ with pkgs; easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync {}; easycrypt = callPackage ../applications/science/logic/easycrypt { - why3 = pkgs.why3.override { ideSupport = false; }; + why3 = pkgs.why3.override { + ideSupport = false; + version = "1.7.2"; + coqPackages = { coq = null; flocq = null; }; + }; }; easycrypt-runtest = callPackage ../applications/science/logic/easycrypt/runtest.nix { }; @@ -7953,6 +7957,10 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; + framac = callPackage ../by-name/fr/framac/package.nix { + why3 = why3.override { version = "1.7.2"; coqPackages = coqPackages_8_18; }; + }; + fswatch = callPackage ../development/tools/misc/fswatch { inherit (darwin.apple_sdk.frameworks) CoreServices; autoreconfHook = buildPackages.autoreconfHook269; @@ -17234,9 +17242,7 @@ with pkgs; stdenv = gccStdenv; }; - why3 = callPackage ../applications/science/logic/why3 { - coqPackages = coqPackages_8_18; - }; + why3 = callPackage ../applications/science/logic/why3 { }; yices = callPackage ../applications/science/logic/yices { gmp-static = gmp.override { withStatic = true; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b22904c70080..d8649636dbb2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -962,7 +962,9 @@ let lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; lambdapi = callPackage ../development/ocaml-modules/lambdapi { - why3 = pkgs.why3.override { ocamlPackages = self; }; + why3 = pkgs.why3.override { ocamlPackages = self; + version = "1.7.2"; coqPackages = pkgs.coqPackages_8_18; + }; }; lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { };