GNU bug report logs -
#74931
[PATCH] gnu: proof-general: Update to 4.5-1.d668946.
Previous Next
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 74931 in the body.
You can then email your comments to 74931 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
julien <at> lepiller.eu, pukkamustard <at> posteo.net, guix-patches <at> gnu.org:
bug#74931; Package
guix-patches.
(Tue, 17 Dec 2024 19:40:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Morgan Smith <Morgan.J.Smith <at> outlook.com>:
New bug report received and forwarded. Copy sent to
julien <at> lepiller.eu, pukkamustard <at> posteo.net, guix-patches <at> gnu.org.
(Tue, 17 Dec 2024 19:40:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/coq.scm (proof-general): Update to 4.5-1.d668946.
[phases] Remove unneeded phases and fix shebang fix.
Change-Id: I5ce2775cf18775737853d76b5a50d461aa9d14e6
---
Currently the coqtags program included in proof-general does not work as the
shebang is patched incorrectly.
This patch fixes that and updates proof-general.
gnu/packages/coq.scm | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index ea0868f226..e6df4bf98f 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -135,7 +135,7 @@ (define-public proof-general
;; The latest release is from 2022 and there has been more than 100 commits
;; since then.
;; Commit from 2024-04-29.
- (let ((commit "cb23709ad0c9a9ca0ee48b3ee73c29caea243b98")
+ (let ((commit "d6689469298b4140dc1f0f8b0ff7e8f937041ffe")
(revision "1"))
(package
(name "proof-general")
@@ -148,7 +148,7 @@ (define-public proof-general
(file-name (git-file-name name version))
(sha256
(base32
- "1spd8rz95s1x91i4lbbb6zabb8014fihx6ai6pgad1nwyr0y9bir"))))
+ "1d12z41rn5nh15qj4sf0w8xrbd9djxlrz0r6g38fiq63i7krbm4x"))))
(build-system gnu-build-system)
(native-inputs
`(("emacs" ,emacs-minimal)
@@ -168,30 +168,14 @@ (define-public proof-general
#:phases
(modify-phases %standard-phases
(delete 'configure)
- (add-after 'unpack 'disable-byte-compile-error-on-warn
- (lambda _
- (substitute* "Makefile"
- (("\\(setq byte-compile-error-on-warn t\\)")
- "(setq byte-compile-error-on-warn nil)"))))
- (add-after 'unpack 'modify-readme-name
- ;; The README file is called "README.md", but the Make variable
- ;; "DOC_FILES" still refers to "README".
- (lambda _
- (substitute* "Makefile"
- (("README") "README.md"))))
(add-after 'unpack 'patch-hardcoded-paths
(lambda _
(substitute* "Makefile"
(("/sbin/install-info") "install-info"))))
- (add-after 'unpack 'remove-which
+ (add-after 'unpack 'do-not-patch-script-shebangs
(lambda _
(substitute* "Makefile"
- (("`which perl`") "perl")
- (("`which bash`") "bash"))))
- (add-after 'unpack 'clean
- (lambda _
- ;; Delete the pre-compiled elc files for Emacs 23.
- (invoke "make" "clean")))
+ (("install-bin: scripts") "install-bin:"))))
(add-after 'install 'install-doc
(lambda* (#:key make-flags #:allow-other-keys)
;; XXX FIXME avoid building/installing pdf files,
base-commit: 8e71580aae17f0c84896519d63246ab4bbb77fc4
--
2.46.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#74931; Package
guix-patches.
(Tue, 17 Dec 2024 20:29:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 74931 <at> debbugs.gnu.org (full text, mbox):
Morgan Smith <Morgan.J.Smith <at> outlook.com> writes:
> * gnu/packages/coq.scm (proof-general): Update to 4.5-1.d668946.
> [phases] Remove unneeded phases and fix shebang fix.
>
> ...
>
> diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
> index ea0868f226..e6df4bf98f 100644
> --- a/gnu/packages/coq.scm
> +++ b/gnu/packages/coq.scm
> @@ -135,7 +135,7 @@ (define-public proof-general
> ;; The latest release is from 2022 and there has been more than 100 commits
> ;; since then.
> ;; Commit from 2024-04-29.
> - (let ((commit "cb23709ad0c9a9ca0ee48b3ee73c29caea243b98")
> + (let ((commit "d6689469298b4140dc1f0f8b0ff7e8f937041ffe")
> (revision "1"))
Shouldn't the revision be incremented as well?
--
Suhail
Information forwarded
to
julien <at> lepiller.eu, pukkamustard <at> posteo.net, guix-patches <at> gnu.org:
bug#74931; Package
guix-patches.
(Wed, 18 Dec 2024 04:09:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 74931 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/coq.scm (proof-general): Update to 4.5-2.d668946.
[phases] Remove unneeded phases and fix shebang fix.
Change-Id: I5ce2775cf18775737853d76b5a50d461aa9d14e6
---
Yes I should bump the revision. Thanks for catching that!
gnu/packages/coq.scm | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index ea0868f226..3ef91ad78a 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -135,8 +135,8 @@ (define-public proof-general
;; The latest release is from 2022 and there has been more than 100 commits
;; since then.
;; Commit from 2024-04-29.
- (let ((commit "cb23709ad0c9a9ca0ee48b3ee73c29caea243b98")
- (revision "1"))
+ (let ((commit "d6689469298b4140dc1f0f8b0ff7e8f937041ffe")
+ (revision "2"))
(package
(name "proof-general")
(version (git-version "4.5" revision commit))
@@ -148,7 +148,7 @@ (define-public proof-general
(file-name (git-file-name name version))
(sha256
(base32
- "1spd8rz95s1x91i4lbbb6zabb8014fihx6ai6pgad1nwyr0y9bir"))))
+ "1d12z41rn5nh15qj4sf0w8xrbd9djxlrz0r6g38fiq63i7krbm4x"))))
(build-system gnu-build-system)
(native-inputs
`(("emacs" ,emacs-minimal)
@@ -168,30 +168,14 @@ (define-public proof-general
#:phases
(modify-phases %standard-phases
(delete 'configure)
- (add-after 'unpack 'disable-byte-compile-error-on-warn
- (lambda _
- (substitute* "Makefile"
- (("\\(setq byte-compile-error-on-warn t\\)")
- "(setq byte-compile-error-on-warn nil)"))))
- (add-after 'unpack 'modify-readme-name
- ;; The README file is called "README.md", but the Make variable
- ;; "DOC_FILES" still refers to "README".
- (lambda _
- (substitute* "Makefile"
- (("README") "README.md"))))
(add-after 'unpack 'patch-hardcoded-paths
(lambda _
(substitute* "Makefile"
(("/sbin/install-info") "install-info"))))
- (add-after 'unpack 'remove-which
+ (add-after 'unpack 'do-not-patch-script-shebangs
(lambda _
(substitute* "Makefile"
- (("`which perl`") "perl")
- (("`which bash`") "bash"))))
- (add-after 'unpack 'clean
- (lambda _
- ;; Delete the pre-compiled elc files for Emacs 23.
- (invoke "make" "clean")))
+ (("install-bin: scripts") "install-bin:"))))
(add-after 'install 'install-doc
(lambda* (#:key make-flags #:allow-other-keys)
;; XXX FIXME avoid building/installing pdf files,
base-commit: 8e71580aae17f0c84896519d63246ab4bbb77fc4
--
2.46.0
Reply sent
to
Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility.
(Mon, 23 Dec 2024 18:12:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Morgan Smith <Morgan.J.Smith <at> outlook.com>:
bug acknowledged by developer.
(Mon, 23 Dec 2024 18:12:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 74931-done <at> debbugs.gnu.org (full text, mbox):
Morgan Smith <Morgan.J.Smith <at> outlook.com> skribis:
> * gnu/packages/coq.scm (proof-general): Update to 4.5-2.d668946.
> [phases] Remove unneeded phases and fix shebang fix.
>
> Change-Id: I5ce2775cf18775737853d76b5a50d461aa9d14e6
Applied, thanks!
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Tue, 21 Jan 2025 12:24:11 GMT)
Full text and
rfc822 format available.
This bug report was last modified 227 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.