From patchwork Thu Apr 25 15:21:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus Diaz X-Patchwork-Id: 63357 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 CF91127BBEA; Thu, 25 Apr 2024 16:24:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 E9A5927BBE2 for ; Thu, 25 Apr 2024 16:24:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s00x5-0003T8-6o; Thu, 25 Apr 2024 11:23:59 -0400 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 1s00x3-0003Rn-HB for guix-patches@gnu.org; Thu, 25 Apr 2024 11:23:57 -0400 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 1s00x3-0006YJ-92 for guix-patches@gnu.org; Thu, 25 Apr 2024 11:23:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s00xJ-00013u-Um; Thu, 25 Apr 2024 11:24:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70567] [PATCH v2 4/7] gnu: why3: Use new style. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 25 Apr 2024 15:24:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70567 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70567@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 70567-submit@debbugs.gnu.org id=B70567.17140586253683 (code B ref 70567); Thu, 25 Apr 2024 15:24:13 +0000 Received: (at 70567) by debbugs.gnu.org; 25 Apr 2024 15:23:45 +0000 Received: from localhost ([127.0.0.1]:32925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s00wo-0000wt-W8 for submit@debbugs.gnu.org; Thu, 25 Apr 2024 11:23:44 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:57773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s00vd-0000hU-Ec for 70567@debbugs.gnu.org; Thu, 25 Apr 2024 11:22:34 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-34c2e765bc6so272829f8f.3 for <70567@debbugs.gnu.org>; Thu, 25 Apr 2024 08:22:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1714058525; x=1714663325; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W1pS6DMfjkVKWFa7YDYpgDJVL4bZTh9uTIS4Z+IShdM=; b=soTV3wP7kvZ6exCPl+GQqczigQ5moY9Cv8VFt6CsU+85o31UodV52l6r3lftAR8pPq wIbzdLviNFtO+sL/6sRg8ZN+LRC6Q5QCRMpqcYbGZGevlNhMd6ECQU5KumNwdt/nfkFf x2MdzsbCQWXysPZmjI81+mZza6gcbtlLdRqrvjJefqxXYrNmUKAcOvqdiSHPOQTTR9sL rSSGrLSsN6Pgs36AxUrJ3F+UgI4cZ55SUQLlomcEkERqrnZIcGpuQNudcMmY2za0gzG5 WLKszGa86CYK35gO/gWPu8ITLI+AIAZCz+r4vUuBQFyW5DU4k+g49fmSFQaMcS+sJV2p MVYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714058525; x=1714663325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W1pS6DMfjkVKWFa7YDYpgDJVL4bZTh9uTIS4Z+IShdM=; b=UL5Hg9FaURypIGt31LgwaJ+Ej+pco43sTT55IAA9hYKMISvpWGqPcYSJDcVgQEoMgM +P9VdkC4kBi6YCNbjhsEGDAmbkgd5C37ZjUeKpp+AAOgkG0kb/OaVTQFttrErDbN0MGZ LioeQZt+QtGK8cqDGnojpFLY4qwnZhBHH8DGiMuUW4zz+GsiPQkCsEKUSWQr4QfmLRub fGHTD9vN5ck1Vr6JLCoGv+ocDhQdlUReDE+REd+FEacwAO6+dHGI51Q7kI+iJqECU5o5 SfR+f2rJ7yHx2Cadq6fnwt1c+B4I9W85uoGtOPUM2QoagM258z7MtzL9a6x3bxsjaVfK JvoA== X-Gm-Message-State: AOJu0YwVSu8bP9NDoDGlSBO08GP+W1dTauTLNyY17pWA2qGMwLTfmJuA V4NHg6+AgQvjFtMwOsTwdlIq6bdI4iOfrAuhYaAQl3sxHU1NCE5zfy4IsQjUo/9FN/QNN9m9KjM 2 X-Google-Smtp-Source: AGHT+IH+stLIhO/CFthr67tPNryU/DTbzGrmSifbKJCuM3WBVkPavxsP9m5PvKRy+Na27Quj0PzKfw== X-Received: by 2002:a05:6000:d10:b0:345:edfd:9529 with SMTP id dt16-20020a0560000d1000b00345edfd9529mr4483213wrb.29.1714058525464; Thu, 25 Apr 2024 08:22:05 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id n4-20020a5d4844000000b00349f098f4a6sm20038674wrs.53.2024.04.25.08.22.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 08:22:05 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Thu, 25 Apr 2024 17:21:54 +0200 Message-ID: <8d9581a5f8063da2f40c4d9d35529219d3a0ee6b.1714058471.git.jean@foundation.xyz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 (why3): Use new style and move arguments above input fields. Change-Id: Ia9cb04cafe426d7f20c5efb10ca540572dbd3be9 --- gnu/packages/maths.scm | 63 +++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5c7f3102f3..57f750accc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9400,36 +9400,41 @@ (define-public why3 (base32 "0fq8wg8ji2v2ssz1d681glmk8glps1irnmdlhqfklaggx01hlf4p")))) (build-system ocaml-build-system) - (native-inputs - (list autoconf automake coq ocaml which)) - (propagated-inputs - (list camlzip ocaml-graph ocaml-menhir ocaml-num ocaml-zarith)) - (inputs - (list coq-flocq emacs-minimal zlib)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'bootstrap - (lambda _ - (invoke "./autogen.sh") - (setenv "CONFIG_SHELL" (which "sh")) - (substitute* "configure" - (("#! /bin/sh") (string-append "#!" (which "sh"))) - ;; find ocaml-num in the correct directory - (("\\$DIR/nums.cma") "$DIR/num.cma") - (("\\$DIR/num.cmi") "$DIR/core/num.cmi")) - #t)) - (add-after 'configure 'fix-makefile - (lambda _ - (substitute* "Makefile" - ;; find ocaml-num in the correct directory - (("site-lib/num") "site-lib")) - #t)) - (add-after 'install 'install-lib - (lambda _ - (invoke "make" "byte") - (invoke "make" "install-lib") - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ + (invoke "./autogen.sh") + (setenv "CONFIG_SHELL" (which "sh")) + (substitute* "configure" + (("#! /bin/sh") (string-append "#!" (which "sh"))) + ;; find ocaml-num in the correct directory + (("\\$DIR/nums.cma") "$DIR/num.cma") + (("\\$DIR/num.cmi") "$DIR/core/num.cmi")))) + (add-after 'configure 'fix-makefile + (lambda _ + (substitute* "Makefile" + ;; find ocaml-num in the correct directory + (("site-lib/num") "site-lib")))) + (add-after 'install 'install-lib + (lambda _ + (invoke "make" "byte") + (invoke "make" "install-lib")))))) + (native-inputs (list autoconf + automake + coq + ocaml + ocaml-findlib + which)) + (propagated-inputs (list camlzip + ocaml-graph + ocaml-menhir + ocaml-num + ocaml-zarith)) + (inputs (list coq-flocq + emacs-minimal + zlib)) (home-page "https://why3.lri.fr") (synopsis "Deductive program verification") (description "Why3 provides a language for specification and programming,