From unknown Fri Aug 15 19:35:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40311] [PATCH] Update proof-general Resent-From: John Soo Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Mar 2020 02:36:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40311 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40311@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158553573617460 (code B ref -1); Mon, 30 Mar 2020 02:36:17 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2020 02:35:36 +0000 Received: from lists.gnu.org ([209.51.188.17]:53884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jIUq4-0001NQ-3g for submit@debbugs.gnu.org; Sun, 29 Mar 2020 06:06:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38143) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIUq2-00012D-GB for guix-patches@gnu.org; Sun, 29 Mar 2020 06:06:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIUq0-0000fH-1x for guix-patches@gnu.org; Sun, 29 Mar 2020 06:06:41 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:38512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jIUpz-0000bQ-Id for guix-patches@gnu.org; Sun, 29 Mar 2020 06:06:40 -0400 Received: by mail-pf1-x42f.google.com with SMTP id c21so6405701pfo.5 for ; Sun, 29 Mar 2020 03:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=2yqpkx0T0CLoJrMOpXqUpU8yIbRUo3AqdLJmRN9f5Iw=; b=wWOjrKVi+nRdKUIHRXooTiTPpWom1VExbbr0zEPWvotw2CzjcjxLzYXDWC89lEOKl3 f7Jpc34YnowfrR1hcvIicLLlL583fKzX7iqkjr8+rXLjTsvgGQ8AhWfaz+6aAe85G3dH LsdP+cXh+pEagEqQ7FhyNHOZaIWAjW6u6TNN4Z3O/iVqY1gcdw4WWd1x3r9M5r/fP5T0 aum8saYm4sDABdNQsmNgPL1hW1HcgyxA2o5oktWYTEFroAf79fimRtRpbKzFYokUCZBQ zvbYtGX4lM1anGuBDRUbTk55xXpdxXPQWSd7/uY+JUsFO5Vg/ioTzYpLnNIVQkGykWZZ IfJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=2yqpkx0T0CLoJrMOpXqUpU8yIbRUo3AqdLJmRN9f5Iw=; b=aKS/35mCdMooktsYxYIZnSX0brZUhyV4qnRDXTLbRct2AprRtGsHNdzQjb7HZndi9k tJKYujymHWqbQUlEx7RjrMtYLq6g1CyTZCKhdOrBdbQk3dFxotIg8kT9OpHK+JbWfqBj Y+nZ/pTTy10DIPEw0zDbqNyxuUeaH7+tuzoTzYRjKvaW4qj7N7H0HMo7+unHtCcI/NhQ o6S9fUFOftN9t8ybkuCbdUqnxECejGO94Ip9dpncALRtBs4eswJK1eUTTTDXI/iGyeRb 03zdGZmQyI0orclxerRbXN681m9ccY1SUY5pWELNj54rbSFEb51P5s0prA7dygYMfSAW hBqw== X-Gm-Message-State: ANhLgQ1uoVU4L9kc3owHUrDw/IpwYOL00appNWDJ72DMPGn/X1ncU6o/ 61ROuoU1LYliSR+5scytfYjRUfoCt+I= X-Google-Smtp-Source: ADFU+vsJXrjo+iR5XCpwwOtyxCyCFdiN/0RYEedAojsbVmeQab5WgnI2TUjKmaotfTIKpzzXdvstJA== X-Received: by 2002:a62:1946:: with SMTP id 67mr8182932pfz.0.1585476397160; Sun, 29 Mar 2020 03:06:37 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::6c3]) by smtp.gmail.com with ESMTPSA id j65sm7465615pgc.16.2020.03.29.03.06.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Mar 2020 03:06:36 -0700 (PDT) From: John Soo Date: Sun, 29 Mar 2020 03:06:34 -0700 Message-ID: <87iminpj9x.fsf@asu.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42f X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2020 10:06:45 -0000 --=-=-= Content-Type: text/plain Hi Guix, In my effort to use strictly guix for my emacs package management, I found that proof-general was not working out of the box with guix.el. In the end I could not figure out how to make it work, but I did update proof-general to 4.4 and updated the home-page. proof-general puts its initialization file in %outputs/share/emacs/site-lisp/site-start.d/pg-init.el. I also see Tuareg puts the file there. Niether that path, nor any subdirectory of site-lisp is included by $EMACSLOADPATH or is autoloaded by guix.el. For the record, I added (load-file "~/.guix-profile/share/emacs/site-lisp/site-start.d/pg-init.el") to init.el as a workaround. Anyways, this should fix proof-general to work with the current version of coq at least and add some more newer niceties in recent versions. Thanks, as always! John --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-proof-general-Update-to-4.4.patch Content-Description: update proof-general. >>From da2d126e7eee0be0c1ca8b7e47345958e60362d3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 29 Mar 2020 02:18:56 -0700 Subject: [PATCH 1/2] gnu: proof-general: Update to 4.4. * gnu/packages/coq.scm (proof-general): Update to 4.4. --- gnu/packages/coq.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 68dfc37450..937e2cc20a 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -133,15 +133,16 @@ It is developed using Objective Caml and Camlp5.") (define-public proof-general (package (name "proof-general") - (version "4.2") + (version "4.4") (source (origin - (method url-fetch) - (uri (string-append - "http://proofgeneral.inf.ed.ac.uk/releases/" - "ProofGeneral-" version ".tgz")) + (method git-fetch) + (uri (git-reference + (url (string-append + "https://github.com/ProofGeneral/PG")) + (commit (string-append "v" version)))) (sha256 (base32 - "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm")))) + "0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8")))) (build-system gnu-build-system) (native-inputs `(("which" ,which) @@ -176,10 +177,6 @@ It is developed using Objective Caml and Camlp5.") (emacs (assoc-ref inputs "host-emacs"))) (define (coq-prog name) (string-append coq "/bin/" name)) - (emacs-substitute-variables "coq/coq.el" - ("coq-prog-name" (coq-prog "coqtop")) - ("coq-compiler" (coq-prog "coqc")) - ("coq-dependency-analyzer" (coq-prog "coqdep"))) (substitute* "Makefile" (("/sbin/install-info") "install-info")) (substitute* "bin/proofgeneral" -- 2.26.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-proof-general-Update-home-page.patch Content-Description: update proof-general home-page >>From bc79d139873c9a831f373dc7e92dacd96a80fecb Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 29 Mar 2020 02:26:46 -0700 Subject: [PATCH 2/2] gnu: proof-general: Update home-page. * gnu/packages/coq.scm (proof-general):[home-page] update to proofgeneral.github.io --- gnu/packages/coq.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 937e2cc20a..2a7fae2a74 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -196,7 +196,7 @@ It is developed using Objective Caml and Camlp5.") (substitute* "Makefile" ((" [^ ]*\\.pdf") "")) (apply invoke "make" "install-doc" make-flags)))))) - (home-page "http://proofgeneral.inf.ed.ac.uk/") + (home-page "https://proofgeneral.github.io/ ") (synopsis "Generic front-end for proof assistants based on Emacs") (description "Proof General is a major mode to turn Emacs into an interactive proof -- 2.26.0 --=-=-=-- From unknown Fri Aug 15 19:35:08 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: John Soo Subject: bug#40311: closed (Re: [bug#40311] [PATCH] Update proof-general) Message-ID: References: <87pncprfg7.fsf@devup.no> <87iminpj9x.fsf@asu.edu> X-Gnu-PR-Message: they-closed 40311 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 40311@debbugs.gnu.org Date: Thu, 02 Apr 2020 17:01:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1585846863-13107-1" This is a multi-part message in MIME format... ------------=_1585846863-13107-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #40311: [PATCH] Update proof-general which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 40311@debbugs.gnu.org. --=20 40311: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40311 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1585846863-13107-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 40311-done) by debbugs.gnu.org; 2 Apr 2020 17:00:02 +0000 Received: from localhost ([127.0.0.1]:40654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jK3CD-0003KL-RK for submit@debbugs.gnu.org; Thu, 02 Apr 2020 13:00:02 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:60749) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jK3CC-0003JS-5a for 40311-done@debbugs.gnu.org; Thu, 02 Apr 2020 13:00:00 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 027685C0211; Thu, 2 Apr 2020 12:59:54 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 02 Apr 2020 12:59:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=O0x95Bzb32XmMaXd8OCmXBmSCe iqiwZRNDMOBKzsEsQ=; b=xlyRT/xdv4zIojni2kwzvyFt4jTUHpBVA+FftJKxA0 xn6HUaXp2mxagpdj9+VyuAjenQE8F+2j+eHmBWZBvbmBxW/+0Qzg09bPx6BK/7Lu H5HzZomXpJwlRxDwX5SWwUie7TInLsNpDmgFu1BcgPHApxM2v8TJknZaUfYnGcyJ 2jgSqBBUuNpjpbV6CFXtDn4/0FE8AD0biYxMtxLfc8FJ6wK6r5djXFkCArpDVBQu GOZD8IH2sI2Wtbvy9uxsk9Te8m9g9WfGmb8Eqrk/iad6i08qq0Xoxr1DVkSgOB9g 5dTQJXnQRDiIqG8B76kgSOGwc/TB3268L6/Vu+AJI87Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=O0x95B zb32XmMaXd8OCmXBmSCeiqiwZRNDMOBKzsEsQ=; b=i+NZUSFflZV/bSlDcvoJLB FaYW98PtJ0gSjLBD66QLwR8F1d0sMMmfGejG6vZEO3LKLDNS4KVtAEK+LJAiCpJu UfsOs4LwV4mDW0ohnjhapsVNLFXRhKf7l0kwYAGC/p28KXcJptZqGHlJXVYd9XFD oEDa2e3g0zbihPdbZ+hllqn9hp+mIW9aKFE3HeYmLBVfTWminDIa9SzNVaspWY3z 4PIOOJ9vJIdFqDJdA3xJ2OHmqQ/PAytl7OmioimeS1VqV7Gns5xyxF/lpAF1YPBR 1kehKpUZ37QEKuAz562lxa8YhFWiW5dOjInzdXtUpjKmA47uo6TWZ9d2el3ou7zw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrtdeggddutddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucffohhmrg hinhepvghlrdhinhenucfkphepkeegrddvtddvrdeikedrjeehnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrg hilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 7848F306CE4A; Thu, 2 Apr 2020 12:59:54 -0400 (EDT) From: Marius Bakke To: John Soo , 40311-done@debbugs.gnu.org Subject: Re: [bug#40311] [PATCH] Update proof-general In-Reply-To: <87iminpj9x.fsf@asu.edu> References: <87iminpj9x.fsf@asu.edu> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Thu, 02 Apr 2020 18:59:52 +0200 Message-ID: <87pncprfg7.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40311-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain John Soo writes: > Hi Guix, > > In my effort to use strictly guix for my emacs package management, I > found that proof-general was not working out of the box with guix.el. > > In the end I could not figure out how to make it work, but I did update > proof-general to 4.4 and updated the home-page. > > proof-general puts its initialization file in > %outputs/share/emacs/site-lisp/site-start.d/pg-init.el. I also see > Tuareg puts the file there. Niether that path, nor any subdirectory of > site-lisp is included by $EMACSLOADPATH or is autoloaded by guix.el. > > For the record, I added > (load-file "~/.guix-profile/share/emacs/site-lisp/site-start.d/pg-init.el") > to init.el as a workaround. > > Anyways, this should fix proof-general to work with the current version > of coq at least and add some more newer niceties in recent versions. Thanks! I applied both patches, and also added a proper commit message for the first one (mention the changes to the various fields). I also added a git-file-name for the first patch as suggested by 'guix lint'. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6GGggACgkQoqBt8qM6 VPoNlwf/buBXD9MpqQgT7EeMW7Rxq40/oZZO12A47wRS1d4dseyNGZcN0NvhgffT /7RqZO5pPP7VTU9A8CErBOa62wa5Aoxq6R1Sq/CYfgztokBjONn+7uCfKgfrRr0J cvVxde2q7Q8HBtdUCcxhxiO2AjTgo/sUOe01jUkxiYNfzzoXO7f2VQRat8349cTu AmqeQKK/wR2DEou/TWZmQpCMkZ73pluf3F/cbyjWzgbzna9MBUbY5rnnZuO+sHEz yZIyDAJfmD2zy9iibkfmLs1nry4XpU4uCBNTstvXt+V8u1bofgkagTKNU8iMWl7/ KiFnrTxSAgOIBLgHVM0dnUUecH+5kA== =TGu3 -----END PGP SIGNATURE----- --=-=-=-- ------------=_1585846863-13107-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Mar 2020 02:35:36 +0000 Received: from lists.gnu.org ([209.51.188.17]:53884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jIUq4-0001NQ-3g for submit@debbugs.gnu.org; Sun, 29 Mar 2020 06:06:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38143) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIUq2-00012D-GB for guix-patches@gnu.org; Sun, 29 Mar 2020 06:06:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIUq0-0000fH-1x for guix-patches@gnu.org; Sun, 29 Mar 2020 06:06:41 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:38512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jIUpz-0000bQ-Id for guix-patches@gnu.org; Sun, 29 Mar 2020 06:06:40 -0400 Received: by mail-pf1-x42f.google.com with SMTP id c21so6405701pfo.5 for ; Sun, 29 Mar 2020 03:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=2yqpkx0T0CLoJrMOpXqUpU8yIbRUo3AqdLJmRN9f5Iw=; b=wWOjrKVi+nRdKUIHRXooTiTPpWom1VExbbr0zEPWvotw2CzjcjxLzYXDWC89lEOKl3 f7Jpc34YnowfrR1hcvIicLLlL583fKzX7iqkjr8+rXLjTsvgGQ8AhWfaz+6aAe85G3dH LsdP+cXh+pEagEqQ7FhyNHOZaIWAjW6u6TNN4Z3O/iVqY1gcdw4WWd1x3r9M5r/fP5T0 aum8saYm4sDABdNQsmNgPL1hW1HcgyxA2o5oktWYTEFroAf79fimRtRpbKzFYokUCZBQ zvbYtGX4lM1anGuBDRUbTk55xXpdxXPQWSd7/uY+JUsFO5Vg/ioTzYpLnNIVQkGykWZZ IfJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=2yqpkx0T0CLoJrMOpXqUpU8yIbRUo3AqdLJmRN9f5Iw=; b=aKS/35mCdMooktsYxYIZnSX0brZUhyV4qnRDXTLbRct2AprRtGsHNdzQjb7HZndi9k tJKYujymHWqbQUlEx7RjrMtYLq6g1CyTZCKhdOrBdbQk3dFxotIg8kT9OpHK+JbWfqBj Y+nZ/pTTy10DIPEw0zDbqNyxuUeaH7+tuzoTzYRjKvaW4qj7N7H0HMo7+unHtCcI/NhQ o6S9fUFOftN9t8ybkuCbdUqnxECejGO94Ip9dpncALRtBs4eswJK1eUTTTDXI/iGyeRb 03zdGZmQyI0orclxerRbXN681m9ccY1SUY5pWELNj54rbSFEb51P5s0prA7dygYMfSAW hBqw== X-Gm-Message-State: ANhLgQ1uoVU4L9kc3owHUrDw/IpwYOL00appNWDJ72DMPGn/X1ncU6o/ 61ROuoU1LYliSR+5scytfYjRUfoCt+I= X-Google-Smtp-Source: ADFU+vsJXrjo+iR5XCpwwOtyxCyCFdiN/0RYEedAojsbVmeQab5WgnI2TUjKmaotfTIKpzzXdvstJA== X-Received: by 2002:a62:1946:: with SMTP id 67mr8182932pfz.0.1585476397160; Sun, 29 Mar 2020 03:06:37 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::6c3]) by smtp.gmail.com with ESMTPSA id j65sm7465615pgc.16.2020.03.29.03.06.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Mar 2020 03:06:36 -0700 (PDT) From: John Soo To: guix-patches@gnu.org Subject: [PATCH] Update proof-general Date: Sun, 29 Mar 2020 03:06:34 -0700 Message-ID: <87iminpj9x.fsf@asu.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42f X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2020 10:06:45 -0000 --=-=-= Content-Type: text/plain Hi Guix, In my effort to use strictly guix for my emacs package management, I found that proof-general was not working out of the box with guix.el. In the end I could not figure out how to make it work, but I did update proof-general to 4.4 and updated the home-page. proof-general puts its initialization file in %outputs/share/emacs/site-lisp/site-start.d/pg-init.el. I also see Tuareg puts the file there. Niether that path, nor any subdirectory of site-lisp is included by $EMACSLOADPATH or is autoloaded by guix.el. For the record, I added (load-file "~/.guix-profile/share/emacs/site-lisp/site-start.d/pg-init.el") to init.el as a workaround. Anyways, this should fix proof-general to work with the current version of coq at least and add some more newer niceties in recent versions. Thanks, as always! John --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-proof-general-Update-to-4.4.patch Content-Description: update proof-general. >>From da2d126e7eee0be0c1ca8b7e47345958e60362d3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 29 Mar 2020 02:18:56 -0700 Subject: [PATCH 1/2] gnu: proof-general: Update to 4.4. * gnu/packages/coq.scm (proof-general): Update to 4.4. --- gnu/packages/coq.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 68dfc37450..937e2cc20a 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -133,15 +133,16 @@ It is developed using Objective Caml and Camlp5.") (define-public proof-general (package (name "proof-general") - (version "4.2") + (version "4.4") (source (origin - (method url-fetch) - (uri (string-append - "http://proofgeneral.inf.ed.ac.uk/releases/" - "ProofGeneral-" version ".tgz")) + (method git-fetch) + (uri (git-reference + (url (string-append + "https://github.com/ProofGeneral/PG")) + (commit (string-append "v" version)))) (sha256 (base32 - "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm")))) + "0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8")))) (build-system gnu-build-system) (native-inputs `(("which" ,which) @@ -176,10 +177,6 @@ It is developed using Objective Caml and Camlp5.") (emacs (assoc-ref inputs "host-emacs"))) (define (coq-prog name) (string-append coq "/bin/" name)) - (emacs-substitute-variables "coq/coq.el" - ("coq-prog-name" (coq-prog "coqtop")) - ("coq-compiler" (coq-prog "coqc")) - ("coq-dependency-analyzer" (coq-prog "coqdep"))) (substitute* "Makefile" (("/sbin/install-info") "install-info")) (substitute* "bin/proofgeneral" -- 2.26.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-proof-general-Update-home-page.patch Content-Description: update proof-general home-page >>From bc79d139873c9a831f373dc7e92dacd96a80fecb Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 29 Mar 2020 02:26:46 -0700 Subject: [PATCH 2/2] gnu: proof-general: Update home-page. * gnu/packages/coq.scm (proof-general):[home-page] update to proofgeneral.github.io --- gnu/packages/coq.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 937e2cc20a..2a7fae2a74 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -196,7 +196,7 @@ It is developed using Objective Caml and Camlp5.") (substitute* "Makefile" ((" [^ ]*\\.pdf") "")) (apply invoke "make" "install-doc" make-flags)))))) - (home-page "http://proofgeneral.inf.ed.ac.uk/") + (home-page "https://proofgeneral.github.io/ ") (synopsis "Generic front-end for proof assistants based on Emacs") (description "Proof General is a major mode to turn Emacs into an interactive proof -- 2.26.0 --=-=-=-- ------------=_1585846863-13107-1--