[bug#66266] [PATCH 0/2] gnu: emacs-lua-mode: Build with newer emacs-buttercup.

[bug#66266] [PATCH 0/2] gnu: emacs-lua-mode: Build with newer emacs-buttercup.

[Hilton Chain via Guix-patches via]

emacs-buttercup-1.25 currently fails to build.  This series replaces it with
emacs-buttercup for its only dependent package emacs-lua-mode and removes it.

Hilton Chain (2):
  gnu: emacs-lua-mode: Build with newer emacs-buttercup.
  gnu: Remove emacs-buttercup-1.25.

 gnu/packages/emacs-xyz.scm | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)


base-commit: 1b0ec97bce2db93ec4159a13fb0a184f012df4fe
--
2.41.0

[bug#66266] [PATCH 1/2] gnu: emacs-lua-mode: Build with newer emacs-buttercup.

[Hilton Chain via Guix-patches via]

* gnu/packages/emacs-xyz (emacs-lua-mode)[native-inputs]: Replace
emacs-buttercup-1.25 with emacs-buttercup.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1f2334e409..54e89d48a6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15532,7 +15532,7 @@ (define-public emacs-lua-mode
      `(#:tests? #t
        #:test-command '("buttercup" "-l" "lua-mode.el")))
     (native-inputs
-     (list emacs-buttercup-1.25 lua))
+     (list emacs-buttercup lua))
     (synopsis "Major mode for lua")
     (description
      "This Emacs package provides a mode for @uref{https://www.lua.org/,
-- 
2.41.0

[bug#66266] [PATCH 2/2] gnu: Remove emacs-buttercup-1.25.

[Hilton Chain via Guix-patches via]

* gnu/packages/emacs-xyz.scm (emacs-buttercup-1.25): Delete variable.
---
 gnu/packages/emacs-xyz.scm | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 54e89d48a6..2e0b094d85 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -28541,23 +28541,6 @@ (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.41.0

bug#66266: [PATCH 0/2] gnu: emacs-lua-mode: Build with newer emacs-buttercup.

[Tobias Geerinckx-Rice via Guix-patches via]

Pushed as eb1c3fff20d1f616f2e2ec8e12e39ea268d5e095 et al.

Thanks!

T G-R

Sent from a Web browser.  Excuse or enjoy my brevity.