From 2bd31290399badaec654bbd816610815026c6b74 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 4 Jul 2025 08:48:21 +0200 Subject: [PATCH] build-system: emacs: Use new lisp-mnt primitives. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 3fc9020d626..3436c5a1a6c 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)