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

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

[zimoun]

Hi,

The update of emacs-buttercup by commit f5b51a621238ff325794e79019d2dbfc018e63bf

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

    https://ci.guix.gnu.org/build/1204944/details

or

    https://data.guix.gnu.org/repository/1/branch/master/package/emacs-lua-mode/output-history


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

[bug#57979] [PATCH 1/1] gnu: emacs-lua-mode: Fix build.

[zimoun]

* 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(-)

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

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

[Ludovic Courtès]

Hi,

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

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

Applied, thanks!

Ludo’.