GNU bug report logs - #78599
[PATCH emacs-team 0/7] Last patches for emacs-team

Previous Next

To reply to this bug, email your comments to 78599 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH emacs-team 0/7] Last patches for emacs-team
Date: Tue, 27 May 2025 00:57:23 +0200

These are the last fixes I can come up with for the emacs-team branch.
I think with a rebase and these we should merge the emacs-team branch
in master.

Nicolas Graves (7):
  gnu: emacs-racket-mode: Update to 1-8.7f2813d.
  gnu: emacs-ob-racket: Skip tests.
  gnu: emacs-espuds: Move to (gnu packages emacs-build).
  gnu: emacs-ecukes: Move to (gnu packages emacs-build).
  gnu: emacs-prodigy: Skip tests.
  gnu: emacs-origami: Fix invalid-face-box.
  gnu: emacs-keystore-mode: Improve style and enable tests.

 gnu/packages/emacs-build.scm | 60 +++++++++++++++++++++++
 gnu/packages/emacs-xyz.scm   | 95 +++++++++---------------------------
 2 files changed, 84 insertions(+), 71 deletions(-)

-- 
2.49.0

Message #8 received at 78599 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78599 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 1/7] gnu: emacs-racket-mode: Update to 1-8.7f2813d.
Date: Tue, 27 May 2025 01:05:17 +0200

* gnu/packages/emacs-xyz.scm (emacs-racket-mode): Update to 1-8.7f2813d.
---
 gnu/packages/emacs-xyz.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e2f106794c..3637536876 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -29038,13 +29038,13 @@ (define-public emacs-faceup
 
 (define-public emacs-racket-mode
   ;; XXX: Upstream does not tag releases, nor does it bump versions.  The
-  ;; "0.0.2" version below does not exist.  It might change, tho.  See
+  ;; "1" version below does not exist.  It might change, tho.  See
   ;; <https://github.com/greghendershott/racket-mode/issues/389>.
-  (let ((commit "cef5a55d2b766973db92f9d9ab2210c03fa8ba02")
-        (revision "7"))
+  (let ((commit "7f2813da48baf980f1ae188f651dafa98ba951cd")
+        (revision "8"))
     (package
       (name "emacs-racket-mode")
-      (version (git-version "0.0.2" revision commit))
+      (version (git-version "1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29054,7 +29054,7 @@ (define-public emacs-racket-mode
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0zzk0s4akx6ffsbhylgfflcypkkg36a3accxhmmdd11yn5rckv7f"))))
+           "124zr2432kqyjak516mrc801kdkmb2072c906j942mf0zwjvh16v"))))
       (build-system emacs-build-system)
       (arguments
        (list
-- 
2.49.0

Message #11 received at 78599 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78599 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 2/7] gnu: emacs-ob-racket: Skip tests.
Date: Tue, 27 May 2025 01:05:18 +0200

* gnu/packages/emacs-xyz.scm (emacs-ob-racket): Skip tests.
---
 gnu/packages/emacs-xyz.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3637536876..455c498785 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -29092,6 +29092,8 @@ (define-public emacs-ob-racket
                 "0bqhxi1nikxwc0gyqsnxc7ya2s41vc06w39s24qz64kja8zqzzya"))
               (file-name (git-file-name name version))))
     (build-system emacs-build-system)
+    (arguments
+     (list #:tests? #f))  ; No tests.
     (home-page "https://github.com/hasu/emacs-ob-racket")
     (synopsis "Org Babel support for Racket")
     (description
-- 
2.49.0

Message #14 received at 78599 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78599 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 3/7] gnu: emacs-espuds: Move to (gnu packages emacs-build).
Date: Tue, 27 May 2025 01:05:19 +0200

* gnu/packages/emacs-xyz.scm (emacs-espuds): Move from here…
* gnu/packages/emacs-build.scm (emacs-espuds): …to here.
---
 gnu/packages/emacs-build.scm | 23 +++++++++++++++++++++++
 gnu/packages/emacs-xyz.scm   | 23 -----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/emacs-build.scm b/gnu/packages/emacs-build.scm
index bc56a83e3c..d3a6575621 100644
--- a/gnu/packages/emacs-build.scm
+++ b/gnu/packages/emacs-build.scm
@@ -345,6 +345,29 @@ (define-public emacs-ert-runner
 running tests easier.")
     (license license:gpl3+)))
 
+(define-public emacs-espuds
+  (package
+    (name "emacs-espuds")
+    (version "0.3.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ecukes/espuds")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg"))))
+    (build-system emacs-build-system)
+    (arguments (list #:tests? #f))      ; XXX: test defined twice
+    (propagated-inputs
+     (list emacs-s emacs-dash emacs-f))
+    (home-page "https://github.com/ecukes/espuds")
+    (synopsis "Common step definitions for Ecukes")
+    (description "Espuds is a collection of the most commonly used step
+definitions for testing with the Ecukes framework.")
+    (license license:gpl3+)))
+
 (define-public emacs-f
   (package
     (name "emacs-f")
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 455c498785..0a513a7605 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8027,29 +8027,6 @@ (define-public emacs-eslint-flymake
        "This package lets Flymake run ESLint on the current buffer.")
       (license license:gpl3+))))
 
-(define-public emacs-espuds
-  (package
-    (name "emacs-espuds")
-    (version "0.3.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ecukes/espuds")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg"))))
-    (build-system emacs-build-system)
-    (arguments (list #:tests? #f))      ; XXX: test defined twice
-    (propagated-inputs
-     (list emacs-s emacs-dash emacs-f))
-    (home-page "https://github.com/ecukes/espuds")
-    (synopsis "Common step definitions for Ecukes")
-    (description "Espuds is a collection of the most commonly used step
-definitions for testing with the Ecukes framework.")
-    (license license:gpl3+)))
-
 (define-public emacs-spark
   (let ((version "20160503")  ; no proper tag, use date of commit
         (commit "0bf148c3ede3b31d56fd75f347cdd0b0eae60025")
-- 
2.49.0

Message #17 received at 78599 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78599 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 4/7] gnu: emacs-ecukes: Move to (gnu packages emacs-build).
Date: Tue, 27 May 2025 01:05:20 +0200

* gnu/packages/emacs-xyz.scm (emacs-ecukes): Move from here…
* gnu/packages/emacs-build.scm (emacs-ecukes): …to here.
---
 gnu/packages/emacs-build.scm | 37 ++++++++++++++++++++++++++++++++++++
 gnu/packages/emacs-xyz.scm   | 37 ------------------------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/emacs-build.scm b/gnu/packages/emacs-build.scm
index d3a6575621..aeb12436e4 100644
--- a/gnu/packages/emacs-build.scm
+++ b/gnu/packages/emacs-build.scm
@@ -173,6 +173,43 @@ (define-public emacs-dash
     (description "This package provides a modern list API library for Emacs.")
     (license license:gpl3+)))
 
+(define-public emacs-ecukes
+  (package
+    (name "emacs-ecukes")
+    (version "0.6.18")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ecukes/ecukes")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "182qgddfv8nd89y1l55rs5vm5i61ayc8cxbplb8zx0alnid9xrw1"))))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:include (cons* "^feature/" "^reporters/" "^templates/" %default-include)
+       ;; 4 unexpected results:
+       ;;   FAILED  ecukes-run-test/run-step-async-callbacked-no-arg
+       ;;   FAILED  ecukes-run-test/run-step-async-callbacked-with-arg
+       ;;   FAILED  ecukes-run-test/run-step-async-callbacked-with-arg-and-args
+       ;;   FAILED  ecukes-run-test/run-step-async-with-timeout
+       #:tests? #f))
+    (propagated-inputs
+     (list emacs-ansi
+           emacs-commander
+           emacs-dash
+           emacs-espuds
+           emacs-f
+           emacs-s))
+    (home-page "https://github.com/ecukes/ecukes")
+    (synopsis "Cucumber for Emacs")
+    (description
+     "This package provides Ecukes, a Cucumber-inspired integration testing
+tool for Emacs.  Ecukes is not a complete clone of Cucumber and is not
+intended to be.")
+    (license license:gpl3+)))
+
 (define-public emacs-eldev
   (package
     (name "emacs-eldev")
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0a513a7605..dca3844c8d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7945,43 +7945,6 @@ (define-public emacs-gdscript-mode
 and code formatting.")
     (license license:gpl3+)))
 
-(define-public emacs-ecukes
-  (package
-    (name "emacs-ecukes")
-    (version "0.6.18")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/ecukes/ecukes")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "182qgddfv8nd89y1l55rs5vm5i61ayc8cxbplb8zx0alnid9xrw1"))))
-    (build-system emacs-build-system)
-    (arguments
-     `(#:include (cons* "^feature/" "^reporters/" "^templates/" %default-include)
-       ;; 4 unexpected results:
-       ;;   FAILED  ecukes-run-test/run-step-async-callbacked-no-arg
-       ;;   FAILED  ecukes-run-test/run-step-async-callbacked-with-arg
-       ;;   FAILED  ecukes-run-test/run-step-async-callbacked-with-arg-and-args
-       ;;   FAILED  ecukes-run-test/run-step-async-with-timeout
-       #:tests? #f))
-    (propagated-inputs
-     (list emacs-ansi
-           emacs-commander
-           emacs-dash
-           emacs-espuds
-           emacs-f
-           emacs-s))
-    (home-page "https://github.com/ecukes/ecukes")
-    (synopsis "Cucumber for Emacs")
-    (description
-     "This package provides Ecukes, a Cucumber-inspired integration testing
-tool for Emacs.  Ecukes is not a complete clone of Cucumber and is not
-intended to be.")
-    (license license:gpl3+)))
-
 (define-public emacs-ef-themes
   (package
     (name "emacs-ef-themes")
-- 
2.49.0

Message #20 received at 78599 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78599 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 5/7] gnu: emacs-prodigy: Skip tests.
Date: Tue, 27 May 2025 01:05:21 +0200

* gnu/packages/emacs-xyz.scm (emacs-prodigy): Skip tests.
  [arguments]<test-command>: Set it.
  <pĥases>: Add phases 'inject-makel to setup tests.
  <tests?>: Skip them, because of a missing input.
  [native-inputs]: Add emacs-ecukes, emacs-shut-up, makel.
---
 gnu/packages/emacs-xyz.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index dca3844c8d..32e105288a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35583,10 +35583,19 @@ (define-public emacs-prodigy
         (base32
          "04xspdj67nas1ivv0ldlmmkr6v7zd7y3k346pnfgvq8wzqi6x4vz"))))
     (build-system emacs-build-system)
+    (arguments
+     (list #:tests? #f  ; XXX: Missing coffescript requirement.
+           #:test-command #~(list "make" "test-ert")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'inject-makel
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (symlink (search-input-file inputs "include/makel.mk")
+                            "makel.mk"))))))
     (propagated-inputs
      (list emacs-dash emacs-f emacs-s))
     (native-inputs
-     (list emacs-el-mock emacs-ert-async))
+     (list emacs-ecukes emacs-el-mock emacs-ert-async emacs-shut-up makel))
     (home-page "https://github.com/rejeep/prodigy.el")
     (synopsis "Manage external services from within Emacs")
     (description "This package provides a GUI for defining and monitoring services.")
-- 
2.49.0

Message #23 received at 78599 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78599 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 6/7] gnu: emacs-origami: Fix invalid-face-box.
Date: Tue, 27 May 2025 01:05:22 +0200

This fixes face errors in the emacs-keystore-mode dependent package on
emacs <at> 30.

* gnu/packages/emacs-xyz.scm (emacs-origami)[source]<snippet>: Adapt
to emacs <at> 30 face API (:color unspecified has to be changed to :color
nil).
---
 gnu/packages/emacs-xyz.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 32e105288a..8ddf82098b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -35778,7 +35778,10 @@ (define-public emacs-origami
                       (("\\(require 'cl\\)")
                        "(require 'cl-lib)")
                       (("(destructuring-bind|remove-if)" all)
-                       (string-append "cl-" all))))))
+                       (string-append "cl-" all))
+                      (("\\(face-attribute 'highlight :background\\)") "\
+(let ((color (face-attribute 'highlight :background)))
+  (and color (not (eq color 'unspecified)) color))")))))
       (build-system emacs-build-system)
       (propagated-inputs (list emacs-dash emacs-s))
       (home-page "https://github.com/gregsexton/origami.el")
-- 
2.49.0

Message #26 received at 78599 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78599 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH 7/7] gnu: emacs-keystore-mode: Improve style and enable tests.
Date: Tue, 27 May 2025 01:05:23 +0200

* gnu/packages/emacs-xyz.scm (emacs-keystore-mode)[arguments]: Improve
style and enable tests.
---
 gnu/packages/emacs-xyz.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8ddf82098b..ffef21d8d9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -42344,10 +42344,9 @@ (define-public emacs-keystore-mode
           (base32 "06cznkqkm04zz5lqfb514aqvsr2p13arzysixv0ss0bqpvdq7cv7"))))
       (build-system emacs-build-system)
       (arguments
-       `(#:tests? #f                    ; XXX: "invalid face box"
-         #:test-command
-         '("emacs" "--no-init-file" "--batch"
-           "--eval=(require 'ecukes)" "--eval=(ecukes)")))
+       (list #:test-command
+             #~(list "emacs" "--no-init-file" "--batch"
+                     "--eval=(require 'ecukes)" "--eval=(ecukes)")))
       (native-inputs
        (list emacs-ecukes emacs-espuds emacs-undercover openjdk9))
       (propagated-inputs
-- 
2.49.0

Message #31 received at 78599-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 78599-done <at> debbugs.gnu.org
Subject: Re: [PATCH 7/7] gnu: emacs-keystore-mode: Improve style and enable
 tests.
Date: Mon, 9 Jun 2025 18:24:44 +0200

Hello,

I have pushed the commits 1 to 5 to the emacs-team branch;
the last two do not apply since they are already on the master
branch. Closing this issue then.

Andreas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.