[PATCH 0/1] gnu: emacs-lua-mode: Fix build.

  • Done
  • quality assurance status badge
Details
2 participants
  • Ludovic Courtès
  • zimoun
Owner
unassigned
Submitted by
zimoun
Severity
normal
Z
Z
zimoun wrote on 21 Sep 2022 15:36
(address . guix-patches@gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220921133624.2052935-1-zimon.toutoune@gmail.com
Hi,

The update of emacs-buttercup by commit f5b51a621238ff325794e79019d2dbfc018e63bf

breaks the package emacs-lua-mode. As see in


or



The package reintroduces emacs-buttercup@1.25 (not defined public) and uses it.


Cheers,
simon


zimoun (1):
gnu: emacs-lua-mode: Fix build.

gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)


base-commit: 6885f22375b093c08d69bbed6aa42d2e8c11a168
--
2.36.0
Z
Z
zimoun wrote on 21 Sep 2022 15:38
[PATCH 1/1] gnu: emacs-lua-mode: Fix build.
(address . 57979@debbugs.gnu.org)(name . zimoun)(address . zimon.toutoune@gmail.com)
20220921133835.2053713-1-zimon.toutoune@gmail.com
* gnu/packages/emacs-xyz.scm (emacs-buttercup-1.25): New variable.
(emacs-lua-mode): Use it.
---
gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)

Toggle diff (48 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 32e4c33f16..0cdcb42404 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -95,7 +95,7 @@
;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021, 2022 Stefan Reichör <stefan@xsteve.at>
-;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Eugene Klimov <lipklim@mailbox.org>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 David Dashyan <mail@davie.li>
@@ -12816,7 +12816,7 @@ (define-public emacs-lua-mode
`(#:tests? #t
#:test-command '("buttercup" "-l" "lua-mode.el")))
(native-inputs
- (list emacs-buttercup lua))
+ (list emacs-buttercup-1.25 lua))
(synopsis "Major mode for lua")
(description
"This Emacs package provides a mode for @uref{https://www.lua.org/,
@@ -24678,6 +24678,23 @@ (define-public emacs-buttercup
functions to ensure they are called with the right arguments during testing.")
(license license:gpl3+)))
+;;; Required by emacs-lua-mode
+(define emacs-buttercup-1.25
+ (package
+ (inherit emacs-buttercup)
+ (name "emacs-buttercup")
+ (version "1.25")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jorgenschaefer/emacs-buttercup")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fsysvsypda6b7azc15bpaprq3bwx4gb6rlq2mj6f8rgwdqc8153"))))))
+
(define-public emacs-cort
(package
(name "emacs-cort")
--
2.36.0
L
L
Ludovic Courtès wrote on 24 Sep 2022 17:46
Re: bug#57979: [PATCH 0/1] gnu: emacs-lua-mode: Fix build.
(name . zimoun)(address . zimon.toutoune@gmail.com)(address . 57979-done@debbugs.gnu.org)
875yhc93mf.fsf_-_@gnu.org
Hi,

zimoun <zimon.toutoune@gmail.com> skribis:

Toggle quote (3 lines)
> * gnu/packages/emacs-xyz.scm (emacs-buttercup-1.25): New variable.
> (emacs-lua-mode): Use it.

Applied, thanks!

Ludo’.
Closed
?