From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54751) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIkHk-0003Kc-0M for guix-patches@gnu.org; Sun, 29 Mar 2020 22:36:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIkHi-0003P1-D3 for guix-patches@gnu.org; Sun, 29 Mar 2020 22:36:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48619) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jIkHi-0003Ok-7A for guix-patches@gnu.org; Sun, 29 Mar 2020 22:36:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jIkHi-0004fH-3n for guix-patches@gnu.org; Sun, 29 Mar 2020 22:36:18 -0400 Subject: [bug#40311] [PATCH] Update proof-general Resent-Message-ID: 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 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) 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="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40311@debbugs.gnu.org --=-=-= 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 --=-=-=--