guix_mirror_bot pushed a commit to branch emacs-team
in repository guix.
commit 7d2e81549772ef72e43cef68f38a05e3f99d4d0c
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Fri Jul 4 08:48:21 2025 +0200
build-system: emacs: Use new lisp-mnt primitives.
* guix/build/emacs-build-system.scm (ensure-package-description)
[%write-pkg-file-form]: Use ‘lm-summary’ and ‘lm-package-requires’.
Fixes: guix/guix#736 (Missing `*-pkg.el` files).
---
guix/build/emacs-build-system.scm | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/guix/build/emacs-build-system.scm
b/guix/build/emacs-build-system.scm
index 3fc9020d62..3436c5a1a6 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -168,8 +168,6 @@ locations in the store in '.el' files."
(define* (ensure-package-description #:key outputs #:allow-other-keys)
(define (write-pkg-file name)
- (define summary-regexp
- "^;;; [^ ]*\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$")
(define %write-pkg-file-form
`(progn
(require 'lisp-mnt)
@@ -188,16 +186,8 @@ locations in the store in '.el' files."
;; raises an error if version is invalid
(and (version-to-list version) version))
(error "0.0.0"))
- (or (save-excursion
- (goto-char (point-min))
- (and (re-search-forward ,summary-regexp nil t)
- (match-string-no-properties 1)))
- package--default-summary)
- (let ((require-lines (lm-header-multiline "package-requires")))
- (and require-lines
- (package--prepare-dependencies
- (package-read-from-string
- (mapconcat 'identity require-lines " ")))))
+ (or (lm-summary) package--default-summary)
+ (lm-package-requires)
:kind 'single
:url (lm-homepage)
:keywords (lm-keywords-list)
