From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YN10LxXDz2SdJAEASxT56A (envelope-from ) for ; Sun, 06 Aug 2023 17:58:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 6ARILxXDz2Q61wAA9RJhRA (envelope-from ) for ; Sun, 06 Aug 2023 17:58:13 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B3D8047197 for ; Sun, 6 Aug 2023 17:58:12 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="ifaXy/6g"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691337493; a=rsa-sha256; cv=none; b=H5kO5k/oZZZ4XN4ycJKMCcwfZWzmK0unh4UBAOIogXEA9YhMiLNnAgEpoispDvUL+XG/4b LkBsfvSzmsSuN6TBtTxUiXdP/qIHPLVvocp56XzN1QHY3L+5TQ/LzmrOmZHZxbVCVMkLMb 1HltUf5R45hj+IVea9BjRq/nBRV2ry1fC+uTgzvbexo4C2q763NpLo/OtnpkooWM09IuG+ MOjG5YPJ9bfJgcTGjAv1IrnKWtGwGHOZWIA6wkIZ00SM4zOmiuQS9j9ZFe3TaST72AKvKj Q0DJoC+06laORsh6uDxqOBar6OOkyFuSoD3t0s8EleDLhzZZMdSxCVSXA7G0FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691337493; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=2s1JdCtxEYnrpqufm2ouLNTeltiJcZbqRjyhHKv5JBE=; b=OlR6o+/Uhqh02xYOHt9SeZScRTWwsjNYDSq6Zd0Y2hzhNK6rfdh8ot+HLzWMFcTjMoFzvM oIJ/yD8F7oS5Ev/rbRTlNM+QUpJS8qOydMA8d8ne/eiuQCoKhFzNvJFsdDvZ5rXdfW8NW0 HCx7Xzn25X3rENXzngWdzGtzqaDul2FS9JzPb4LVUwhtd2sV9tHTu7hHfyCzs+Jda7m3CN xyYqZ20bojBOZV+rBkWAh66bNw7kmsfkt9lSEGgaH7OAU3YLx76xox8qBX3SIpVXwNGDJq PiC5FmRxj7l20YgvNn9MxV2rdtaYcEiS1emIv7gL3BmXWJ+P2/pXjSFYsDyf8w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="ifaXy/6g"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSfaJ-0004LZ-LJ; Sun, 06 Aug 2023 11:22:23 -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 1qSfa2-0004Fa-PP for guix-patches@gnu.org; Sun, 06 Aug 2023 11:22:08 -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 1qSfa2-0003MA-HK for guix-patches@gnu.org; Sun, 06 Aug 2023 11:22:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSfa0-0002Qo-Ti; Sun, 06 Aug 2023 11:22:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH ocaml-team v5 09/12] 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: Sun, 06 Aug 2023 15:22:04 +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.16913352879201 (code B ref 64249); Sun, 06 Aug 2023 15:22:04 +0000 Received: (at 64249) by debbugs.gnu.org; 6 Aug 2023 15:21:27 +0000 Received: from localhost ([127.0.0.1]:59839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZP-0002OE-1B for submit@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:27 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSfZL-0002N7-9Z for 64249@debbugs.gnu.org; Sun, 06 Aug 2023 11:21:24 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B844A240027 for <64249@debbugs.gnu.org>; Sun, 6 Aug 2023 17:21:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1691335277; bh=n5Ws/qt9fUICNgzqxNKmTzzeTN4zWWZV4A3caGTx0ao=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=ifaXy/6gO7fpXWklKWgYD9kxT7G2rGfGYPt2OIY9d3JyjrVXqhqwWwMBH4Ev3RIcW Z+9Jw0ZGfThiRYkEx/qLmpclIZoTEISRsvczYXYYDourbtYnPFjG53FCRFGqh1sPVl 5rR74CWZOqIQlHjnE1s1rEaMAMazZmwiWoWeSCRRAmsA9TXEgJJAGy7FNrjTmuKDn+ KKe0wWHH98rhyOCnYTfPHOsqlfyr3050h9SuC3jNi56hlBsV7KqltoeE+/qGG4sUFz 3R31yupK0lr9rXtFTwsp6AF6WjZg0AJDVHPujQ0it2PnciC0+oiFBk9SAo5sohOXFQ Y/bQO41s7b+Ig== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RJjpP1rh3z6txn; Sun, 6 Aug 2023 17:21:17 +0200 (CEST) From: pukkamustard Date: Sun, 6 Aug 2023 15:20:28 +0000 Message-ID: <7c82263ece8fff6106930babd4afe2c7a107f3d8.1691335142.git.pukkamustard@posteo.net> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.75 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: B3D8047197 X-Spam-Score: -3.75 X-TUID: JCJpoEIUMa2u * 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-ide)[propagated-inputs]: Add zlib. (coq-mathcomp-bigenough)[propagated-inputs]: Remove coq-core. (coq-mathcomp-finmap)[inputs]: Remove coq-stdlib. (coq-equations): Update to 1.3-8.17. --- gnu/packages/coq.scm | 76 +++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 46 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 663265f5be..b63239b99e 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -31,6 +31,7 @@ (define-module (gnu packages coq) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages compression) #:use-module (gnu packages emacs) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) @@ -50,10 +51,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 +64,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 +79,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 +113,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) @@ -147,7 +131,7 @@ (define-public coq-ide `(#:tests? #f #:package "coqide")) (propagated-inputs - (list coq coq-ide-server)) + (list coq coq-ide-server zlib)) (inputs (list lablgtk3 ocaml-lablgtk3-sourceview3)))) @@ -555,16 +539,16 @@ (define-public coq-autosubst (define-public coq-equations (package (name "coq-equations") - (version "1.3") + (version "1.3-8.17") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/mattam82/Coq-Equations") - (commit (string-append "v" version "-8.16")))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "08f756vgdd1wklkarg0b93j4n5mhkqm5ixxrhyb23dcv2dwhc8yg")))) + "0g68h4c1ijpphixvl9wkd7sibds38v4236dpvvh194j5ii42vnn8")))) (build-system gnu-build-system) (native-inputs (list ocaml coq camlp5)) @@ -716,7 +700,7 @@ (define-public coq-mathcomp-finmap "/lib/coq/user-contrib")) #:phases (modify-phases %standard-phases (delete 'configure)))) - (inputs (list coq coq-stdlib coq-mathcomp which)) + (inputs (list coq coq coq-mathcomp which)) (synopsis "Finite sets and finite types for coq-mathcomp") (description "This library is an extension of coq-mathcomp which supports finite sets @@ -757,7 +741,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 -- 2.41.0