From ef6c49fa50dc30c544afd952170efb295f33c6f5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 30 Nov 2023 05:41:53 +0100 Subject: [PATCH] =?UTF-8?q?why3:=201.6.0=20=E2=86=92=201.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/why3/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index df8be359d123..f0567fdda3b6 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,13 +1,18 @@ { callPackage, fetchurl, lib, stdenv -, ocamlPackages, coqPackages, rubber, hevea, emacs }: +, ocamlPackages, coqPackages, rubber, hevea, emacs +, version ? "1.7.0" +}: stdenv.mkDerivation rec { pname = "why3"; - version = "1.6.0"; + inherit version; src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; - hash = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; + hash = { + "1.7.0" = "sha256-rygrjzuJVukOvpuXTG/yeoEP98ZFkLQHObgc3My1PVY="; + "1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; + }."${version}"; }; strictDeps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7325b6a4ff4a..eb3ab13a926e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19167,7 +19167,9 @@ with pkgs; fprettify = callPackage ../development/tools/fprettify { }; - framac = callPackage ../development/tools/analysis/frama-c { }; + framac = callPackage ../development/tools/analysis/frama-c { + why3 = pkgs.why3.override { version = "1.6.0"; }; + }; frame = callPackage ../development/libraries/frame { };