From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GGuKGsbYeWcwPQEA62LTzQ:P1 (envelope-from ) for ; Sun, 05 Jan 2025 00:56:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id GGuKGsbYeWcwPQEA62LTzQ (envelope-from ) for ; Sun, 05 Jan 2025 01:56:38 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=qB8bmm3F; dkim=fail ("headers rsa verify failed") header.d=antr.me header.s=zmail header.b="L/W0QT08"; 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=none; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1736038598; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=kHznXxIny5j17ZOgaz6qb33MUDwbZLaoORM9bb/xySs=; b=Hsib5TStpc8tuCs/VGO0reymbGSs0y3GO1XgPyntyplq6iOW3aHV6uqpPF5YlOTpIAZqid PcN/gQf8nbAmFCdKZ0mDTca9ynl34D+ol9p6BBCgncpLDy4USZXApvxIjml89kYLn1jY3H xImxa5mtOf8ONviieZuajoGvwN2fTA2iZA+bPYctdvpY0JYiYE+cbaZwUClCkS2mcSsyMl RtgKNgnDwmMXMqhiqhmHJcBhoEX4OmJ4FCPfWMTq5gQKTw678RKnEQSYnMM6n77TBvx+w0 wmgQgOEawHT6EOpIE4b3h1otzdDe6B6iMszNzjro6XNhwtOWEUfBhBLItwwS+g== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=qB8bmm3F; dkim=fail ("headers rsa verify failed") header.d=antr.me header.s=zmail header.b="L/W0QT08"; 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=none; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}") ARC-Seal: i=2; s=key1; d=yhetil.org; t=1736038598; a=rsa-sha256; cv=fail; b=aYUxL9bK41d4KVE8T8z9m2Yi9FYy1/W1XdpQ7iT1QnLXF7Yr0YkMBi7OLEKEvM9jz9bMWN EcJt+v3gzwnWuSn01vKnop9Fv+kFZ/Z/w2XSgf4qTYnRXcPkbPnPPWdKdaFvAg9CsQbcYW R5B3jcfEIRlGWYpLyFUff1/qY9AK7yjZ8zlAfXaOr5JcfrkQonFvOK9sM+lTAs4PytQtqg 2/gLJNIkip12y6T8PjXltZd6BAWlhS5BDqDiLNp/6w3UJJbr1LYz2IzQdd384rnad9bCpk UZR6E+8VkKKWTQXqMtB5BL3u8oDTFSleLC7knxh0G5ZbSD4PoG9SIYXPALaRLg== 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 824BD243A3 for ; Sun, 05 Jan 2025 01:56:37 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUEw6-00048U-Aw; Sat, 04 Jan 2025 19:56:10 -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 1tUEw4-00048E-Gi for guix-patches@gnu.org; Sat, 04 Jan 2025 19:56:08 -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 1tUEw4-0007qv-7n for guix-patches@gnu.org; Sat, 04 Jan 2025 19:56:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=kHznXxIny5j17ZOgaz6qb33MUDwbZLaoORM9bb/xySs=; b=qB8bmm3FaALbY2bo0EfGkWMZ81B9UcxFsO7ULPmXezHDuBjbGfXmq4p9VfeP+siyRPY/qpQAjm5oube3EI9gpvVu6Ptj6B7Uoxyk2WyU7ZQO02smCLjNL9rGeVLs9LffJwl7V7o0EF5IufxJRLKLKMSwxihFNrRiz95AJozftO6zQshOESHlVNyqV12+dHkCUtGb/kw62mB+wmCfNXlfwNTp9bDu8G5g5757Vdt9RY5jLx5DIg6zHswQHyQT6SUvUbCyCwPIH2RDxG2cSGHr5fSC9356CMGWSH1pVoLvoLaCOG//PXH8/s/z2GOTtvR+H+L8xybdoKQrc7mQS3URxA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUEvy-0006rC-Va; Sat, 04 Jan 2025 19:56:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75368] [PATCH] gnu: coq: Update to 8.20.0. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2025 00:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75368 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75368@debbugs.gnu.org Cc: julien@lepiller.eu, pukkamustard@posteo.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: julien@lepiller.eu, pukkamustard@posteo.net Received: via spool by submit@debbugs.gnu.org id=B.173603854026322 (code B ref -1); Sun, 05 Jan 2025 00:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jan 2025 00:55:40 +0000 Received: from localhost ([127.0.0.1]:58037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUEvc-0006qT-4q for submit@debbugs.gnu.org; Sat, 04 Jan 2025 19:55:40 -0500 Received: from lists.gnu.org ([2001:470:142::17]:40262) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUEvZ-0006qC-D8 for submit@debbugs.gnu.org; Sat, 04 Jan 2025 19:55:38 -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 1tUEvT-00046K-5f for guix-patches@gnu.org; Sat, 04 Jan 2025 19:55:31 -0500 Received: from sender4-op-o15.zoho.com ([136.143.188.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tUEvQ-0007oP-C1 for guix-patches@gnu.org; Sat, 04 Jan 2025 19:55:30 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1736038521; cv=none; d=zohomail.com; s=zohoarc; b=NGcUqEq7U6k9xi1EEsp/K+I/sF41MP6ic99YXRpoFHaO4rUt9RWNmyRoesMFG5lCO7gSrAU1tT8LDBMpgimMkmcJehRjOZIPLGjWlagtKCyMsozGh4paK6iB6d1haGRiPYqiqlQX+cUImqmJ0p7mKlZHV6P88ywEffMKO0/wvmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1736038521; h=Content-Type:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=kHznXxIny5j17ZOgaz6qb33MUDwbZLaoORM9bb/xySs=; b=LLrmmSbwwG387BgN2FlgwejvuAhDMFgVJtrl28AsobiMjCOLzYaBZS/eXVBHjApInY6rs3knQMJ98eJYA8jXCzWKX8c7pzK6FsG27NDheG8Ke3+WxiVCRjl4sR7uYskUyT73u6MvnXifbrOfIB+6XziwIz+wmbVKR8ulnnYxk9g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=antr.me; spf=pass smtp.mailfrom=mail@antr.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1736038520; s=zmail; d=antr.me; i=mail@antr.me; h=From:From:To:To:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Message-Id:Reply-To:Cc; bh=kHznXxIny5j17ZOgaz6qb33MUDwbZLaoORM9bb/xySs=; b=L/W0QT08M37WxdVtdBPOGJqnSdHnRV9FXbw+OxNomOL/DP1UV3Rd8hvjNzZ+X8/0 HKtYKj0lWBWmRd7konp6RwDIz0Rf/Mb3c6FK5uzSNP5jLbRDE9PT2Y4frgBIZ/LXCrH i5m3Vz1WCTdvYwtNbsg0o4t80IlM3xDpcO+fwU1M= Received: by mx.zohomail.com with SMTPS id 1736038518277763.6993499860289; Sat, 4 Jan 2025 16:55:18 -0800 (PST) From: Antero Mejr Date: Sat, 04 Jan 2025 19:55:17 -0500 Message-ID: <87zfk62i6i.fsf@antr.me> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.15; envelope-from=mail@antr.me; helo=sender4-op-o15.zoho.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action 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-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -2.35 X-Spam-Score: -2.35 X-Migadu-Queue-Id: 824BD243A3 X-TUID: 4j00gUz06NtW Deprecates coq-ide-server, which is now part of the main coq package. * gnu/packages/coq.scm (coq): Update to 8.20.0. [native-inputs]: Add python, rsync. [arguments]: Patch tests, build coqide-server, symlink `coqidetop`. (coq-ide-server): Deprecate package. (coq-ide)[propagated-inputs]: Remove coq-ide-server. (coq-for-coqtail): Remove hidden package. * gnu/packages/coq.scm (vim-coqtail)[native-inputs]: Remove coq-for-coqtail. [native-inputs]: Add coq. Change-Id: Ic9c3985b76938f78352b8735fb832c7a78519172 --- gnu/packages/coq.scm | 74 ++++++++++++++++++++------------------------ gnu/packages/vim.scm | 2 +- 2 files changed, 35 insertions(+), 41 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 3ef91ad78a..71b14e0dd8 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -57,7 +57,7 @@ (define-module (gnu packages coq) (define-public coq (package (name "coq") - (version "8.18.0") + (version "8.20.0") (source (origin (method git-fetch) @@ -67,7 +67,7 @@ (define-public coq (file-name (git-file-name name version)) (sha256 (base32 - "1qy71gdr4s2l6847b4nwns6akib2f7l725zb01m7zc26n6mrrh1m")))) + "0pf3sfq61w9h7r418pl28cvqidf9iwdn9zzkfbsb9afvj584slkp")))) (native-search-paths (list (search-path-specification (variable "COQPATH") @@ -75,9 +75,31 @@ (define-public coq (build-system dune-build-system) (arguments (list - #:package "coq-core,coq-stdlib,coq" + #:package "coq-core,coq-stdlib,coq,coqide-server" #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; In 8.20, the test Makefile incorrectly assumes installation + ;; occurs before tests. Fixing it here. + (substitute* "test-suite/Makefile" + ;; Disable IDE tests (not available in this package) + ((" ide ide ") + " ") + ;; Disable tests with incorrect paths + ;; TODO: Maybe fixable upstream in a future release? + ((" coq-makefile precomputed-time-tests ") + " ") + ((" \\$\\(VSUBSYSTEMS\\) misc ") + " $(VSUBSYSTEMS) ") + ((" coqdoc ssr ") + " ssr ") + ;; Set COQLIB to correct path + (("COQLIB\\?=") + "COQLIB=../../install/default/lib/coq") + ;; Override incorrect bin directory + (("BIN:=\\$\\(COQPREFIX\\)/bin/") + "BIN=../../install/default/bin/")))) (add-before 'build 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -91,13 +113,18 @@ (define-public coq (let* ((out (assoc-ref outputs "out")) (libdir (string-append out "/lib/ocaml/site-lib"))) (invoke "dune" "install" "--prefix" out - "--libdir" libdir "coq" "coq-core" "coq-stdlib"))))))) + "--libdir" libdir "coq" "coq-core" "coq-stdlib" + "coqide-server") + ;; coqide searches for coqidetop on $PATH, but it is installed + ;; as coqidetop.opt + (symlink (string-append #$output "/bin/coqidetop.opt") + (string-append #$output "/bin/coqidetop")))))))) (propagated-inputs (list ocaml-zarith)) (inputs (list gmp)) (native-inputs - (list ocaml-ounit2 which)) + (list ocaml-ounit2 python rsync which)) (properties '((upstream-name . "coq"))) ; also for inherited packages (home-page "https://coq.inria.fr") (synopsis "Proof assistant for higher-order logic") @@ -110,14 +137,7 @@ (define-public coq (license (list license:lgpl2.1 license:opl1.0+)))) (define-public coq-ide-server - (package - (inherit coq) - (name "coq-ide-server") - (arguments - `(#:tests? #f - #:package "coqide-server")) - (inputs - (list coq gmp)))) + (deprecated-package "coq-ide-server" coq)) (define-public coq-ide (package @@ -127,7 +147,7 @@ (define-public coq-ide `(#:tests? #f #:package "coqide")) (propagated-inputs - (list coq coq-ide-server zlib)) + (list coq zlib)) (inputs (list lablgtk3 ocaml-lablgtk3-sourceview3)))) @@ -255,32 +275,6 @@ (define-public coq-flocq inside Coq.") (license license:lgpl3+))) -;; Union of coq and coq-ide-server as vim-coqtail expects coqc and coqidetop -;; to be in the same bin folder, when vim-coqtail is installed coqc and -;; coqidetop will be in the "same" bin folder in the profile, so this is only -;; required for testing the package. -;; -;; This is deeply ingrained in the internals of vim-coqtail so this is why -;; it's necessary. -(define-public coq-for-coqtail - (hidden-package - (package - (inherit coq) - (name "coq-for-coqtail") - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder - (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories)))))) - (inputs (list coq coq-ide-server))))) - (define-public coq-gappa (package (name "coq-gappa") diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index e77578cf18..01b53d5d92 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -515,7 +515,7 @@ (define-public vim-coqtail ;; they don't get installed. (delete-file-recursively "python/__pycache__"))))))) (native-inputs - (list coq-for-coqtail + (list coq python-pytest vim-vader)) (propagated-inputs (list coq coq-ide-server)) base-commit: b8858d8b1344525d0d7ac78d8fb9dc1a577b85d3 -- 2.46.0