From patchwork Wed Jan 10 07:43:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58762 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ADE3727BBE9; Wed, 10 Jan 2024 08:06:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AF73527BBE2 for ; Wed, 10 Jan 2024 08:06:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTb3-0003jr-B4; Wed, 10 Jan 2024 03:05:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNTb1-0003iX-9F for guix-patches@gnu.org; Wed, 10 Jan 2024 03:05:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNTb1-0005Ds-0i for guix-patches@gnu.org; Wed, 10 Jan 2024 03:05:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTb8-0005VV-2O for guix-patches@gnu.org; Wed, 10 Jan 2024 03:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 32/34] gnu: frama-c: Update to 27.1. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 08:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487390521096 (code B ref 64249); Wed, 10 Jan 2024 08:06:02 +0000 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 08:05:05 +0000 Received: from localhost ([127.0.0.1]:41780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTaC-0005U9-8P for submit@debbugs.gnu.org; Wed, 10 Jan 2024 03:05:05 -0500 Received: from lepiller.eu ([89.234.186.109]:59302 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFq-0007zA-4a for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:03 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 3729dd71 for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=WHdSGjdlVhcJ SOq6HTnKEXhPaPdI99GA9F4w/4heFv4=; b=Byr0uv9dUNDBj3kTT/c1ywV5FeEN MLmLsWGxikgs6eMwsncXOXMvJflD77mkB5hmE+CpkLjspPHDnc4K6kzg7Tl8YYKj ibqgM5xN5wISqsboxIvHPXB7GrnuRfL0mERUB2kYhoaDK2bTbc2LzxMRrWwVuv/h DWJ7eX40b2DcCf9Uo5GuAT15VQGLoZ+cy8yRT99fbVbo0zBugY+r9EBEF9gGAKi1 g0IBZd03er00o0SKibd4bmpzrTbaqPF/eC5MOUptaqaLlz9Hp3vhXR1g1NoDD0FA X1ijbTS630WaDbP/pGdXZTR4hG28SDnywiSGELVLQUwMnOofkvm86NijPw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 863585a9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:48 +0000 (UTC) From: Julien Lepiller Date: Wed, 10 Jan 2024 08:43:33 +0100 Message-ID: <20240110074336.24651-32-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (frama-c): Update to 27.1. (why3): Update to 1.6.0. Change-Id: I74191e4274d58a88a772413875fbf7de4d243fec --- gnu/packages/maths.scm | 54 +++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index adc7beb655..400c240577 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2018, 2020-2022 Marius Bakke ;;; Copyright © 2018 Eric Brown -;;; Copyright © 2018, 2021 Julien Lepiller +;;; Copyright © 2018, 2021, 2024 Julien Lepiller ;;; Copyright © 2018 Amin Bandali ;;; Copyright © 2019, 2021-2023 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang @@ -93,6 +93,7 @@ (define-module (gnu packages maths) #:use-module (guix build-system ant) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) + #:use-module (guix build-system dune) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -183,6 +184,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages tex) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages wxwidgets) @@ -9352,7 +9354,7 @@ (define-public numdiff (define-public why3 (package (name "why3") - (version "1.4.1") + (version "1.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -9361,7 +9363,7 @@ (define-public why3 (file-name (git-file-name name version)) (sha256 (base32 - "1yca6mx8bjm8x0i594ivh31aw45s6fbimmwfj8g2v9zwrgmr1i4s")))) + "0k3y98xzhrl44vwzq2m6k4nrllrwp3ll69lc2gfl8d77w0wg7gkp")))) (build-system ocaml-build-system) (native-inputs (list autoconf automake coq ocaml which)) @@ -9409,36 +9411,38 @@ (define-public why3 (define-public frama-c (package (name "frama-c") - (version "24.0") + (version "27.1") (source (origin (method url-fetch) (uri (string-append "http://frama-c.com/download/frama-c-" - version "-Chromium.tar.gz")) + version "-Cobalt.tar.gz")) (sha256 (base32 - "0x1xgip50jdz1phsb9rzwf2ra8lshn1hmd9g967xia402wrg3sjf")))) - (build-system ocaml-build-system) + "1lirkvhf5m53d33l0aw5jzc1fyzkwx5fkgh9g71732d52r55f4sv")))) + (build-system dune-build-system) (arguments - `(#:tests? #f; no test target in Makefile - #:configure-flags - (list "--enable-verbosemake") ; to aid debugging - #:phases - (modify-phases %standard-phases - (add-before 'configure 'export-shell - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CONFIG_SHELL" - (search-input-file inputs "/bin/sh"))))))) + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'set-env + (lambda _ + (setenv "CC" "gcc")))))) (inputs (list gmp zlib)) - (propagated-inputs - (list ocaml-biniou - ocaml-easy-format - ocaml-graph - ocaml-yojson - ocaml-zarith - ocaml-lablgtk3-sourceview3 - lablgtk3 - why3)) + (propagated-inputs (list + graphviz + lablgtk3 + ocaml-graph + ocaml-odoc + ocaml-lablgtk3-sourceview3 + ocaml-yaml + ocaml-yojson + ocaml-zarith + ocaml-ppx-deriving + ocaml-ppx-deriving-yojson + ocaml-ppx-deriving-yaml + ocaml-ppx-import + why3)) + (native-inputs (list dune-site time ocaml-menhir ocaml-graph)) (native-search-paths (list (search-path-specification (variable "FRAMAC_SHARE")