From patchwork Fri Jul 28 11:08:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 52302 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 8B79C27BBEA; Fri, 28 Jul 2023 12:18:07 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 4B12027BBE9 for ; Fri, 28 Jul 2023 12:18:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPLMC-0000sE-1e; Fri, 28 Jul 2023 07:10:04 -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 1qPLMB-0000s4-3A for guix-patches@gnu.org; Fri, 28 Jul 2023 07:10:03 -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 1qPLMA-000859-RK for guix-patches@gnu.org; Fri, 28 Jul 2023 07:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPLMA-00006q-NH; Fri, 28 Jul 2023 07:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH ocaml-team v4 5/9] gnu: coq: Update to 8.17.1. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Fri, 28 Jul 2023 11:10: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 Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169054254732757 (code B ref 64249); Fri, 28 Jul 2023 11:10:02 +0000 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:07 +0000 Received: from localhost ([127.0.0.1]:43847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLG-0008WA-42 for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:07 -0400 Received: from mout01.posteo.de ([185.67.36.65]:44247) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLA-0008U8-Dl for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:01 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D9B4D240028 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542534; bh=X/eXZDk7vm2Oqyo6tDMFe2VA5E2J75zBAJSmx++V3kE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=rz8HM2ewVykeMxTS94PhdRgbfH2snfyri1PEtjtQwH50cvYbVOz5QUdlba89YrjVI a34F3+AZndgFSDJaHCkVKPDH82KwIVPa8cB7Jgb1fundS8pTZMtWl8zZICWIRtyllj PdgzIk8F1Z3BH/qRYY85nnNOGUz1gWyWnIF/cOqTXZnyUYVtptDLEJPXxDMXhl3bWH Scuxj9i+2yNYIrHOfQGzixce6YNRoIR/REBtkxb7Xh9dLwMh4saeoh8rwJZj4w3eFE PBbeMssgA9cbb9kLv82MNSeT7OHmeQA7oAN6zr3a54MjJrtjr+16c05NxI1aOqGWgW cp0nRQ05B21xg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dL34b5z6txd; Fri, 28 Jul 2023 13:08:54 +0200 (CEST) From: pukkamustard Date: Fri, 28 Jul 2023 11:08:27 +0000 Message-ID: <97754585bac7132fd7ab70f7c7b5372ddad049c3.1690541801.git.pukkamustard@posteo.net> 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/coq.scm (coq): Update to 8.17.1 and merge with coq-core and coq-stdlib. [arguments] Merge with coq-core and coq-stdlib. Add pre-build phases and add a custom install phase. Remove unnecessary test-target (coq-core): Remove variable. (coq-stdlib): Remove variable. (coq-mathcomp-bigenough)[propagated-inputs] Remove coq-core. --- gnu/packages/coq.scm | 65 ++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 41 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index cc914422d4..6f9205cfb0 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -50,10 +50,10 @@ (define-module (gnu packages coq) #:use-module (guix utils) #:use-module ((srfi srfi-1) #:hide (zip))) -(define-public coq-core +(define-public coq (package - (name "coq-core") - (version "8.16.1") + (name "coq") + (version "8.17.1") (source (origin (method git-fetch) @@ -63,7 +63,7 @@ (define-public coq-core (file-name (git-file-name name version)) (sha256 (base32 - "0ljpqhh5lfsim29fcfp2xfcvm3j84pf1mb0gnpdr8vcqqw7mqwpf")) + "0gg6hizq0i08lk741b579cbswhy6qvkh6inc3d3i5a2af98psq63")) (patches (search-patches "coq-fix-envvars.patch")))) (native-search-paths (list (search-path-specification @@ -78,13 +78,29 @@ (define-public coq-core (files (list "lib/ocaml/site-lib/coq-core")) (separator #f)))) (build-system dune-build-system) + (arguments + `(#:package "coq-core,coq-stdlib,coq" + #:phases + (modify-phases %standard-phases + (add-before 'build 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libdir (string-append out "/lib/ocaml/site-lib"))) + (invoke "./configure" "-prefix" out + "-libdir" libdir)))) + (add-before 'build 'make-dunestrap + (lambda _ (invoke "make" "dunestrap"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libdir (string-append out "/lib/ocaml/site-lib"))) + (invoke "dune" "install" "--prefix" out + "--libdir" libdir + "coq-core" "coq-stdlib" "coq"))))))) (inputs (list gmp ocaml-zarith)) (native-inputs (list ocaml-ounit2 which)) - (arguments - `(#:package "coq-core" - #:test-target ".")) (properties '((upstream-name . "coq"))) ; also for inherited packages (home-page "https://coq.inria.fr") (synopsis "Proof assistant for higher-order logic") @@ -96,39 +112,6 @@ (define-public coq-core ;; Some of the documentation is distributed under opl1.0+. (license (list license:lgpl2.1 license:opl1.0+)))) -(define-public coq-stdlib - (package - (inherit coq-core) - (name "coq-stdlib") - (arguments - `(#:package "coq-stdlib" - #:test-target "." - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-dune - (lambda _ - (substitute* "user-contrib/Ltac2/dune" - (("coq-core.plugins.ltac2") - (string-join - (map (lambda (plugin) (string-append "coq-core.plugins." plugin)) - '("ltac2" "number_string_notation" "tauto" "cc" - "firstorder")) - " ")))))))) - (inputs - (list coq-core gmp ocaml-zarith)) - (native-inputs '()))) - -(define-public coq - (package - (inherit coq-core) - (name "coq") - (arguments - `(#:package "coq" - #:test-target ".")) - (propagated-inputs - (list coq-core coq-stdlib)) - (native-inputs '()))) - (define-public coq-ide-server (package (inherit coq) @@ -761,7 +744,7 @@ (define-public coq-mathcomp-bigenough "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases (delete 'configure)))) - (propagated-inputs (list coq coq-core coq-mathcomp which)) + (propagated-inputs (list coq coq-mathcomp which)) (home-page "https://math-comp.github.io/") (synopsis "Small library to do epsilon - N reasoning") (description