amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system: emacs: Use new lisp-mnt primitives.

Browse source 
* 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).
This commit is contained in:
Liliana Marie Prikler 2025-07-04 08:48:21 +02:00
parent 8030c91dc2
commit 2bd3129039
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
guix/build/emacs-build-system.scm
View file

@ -168,8 +168,6 @@ locations in the store in '.el' files."
(define* (ensure-package-description #:key outputs #:allow-other-keys) (define* (ensure-package-description #:key outputs #:allow-other-keys)
(define (write-pkg-file name) (define (write-pkg-file name)
(define summary-regexp
"^;;; [^ ]*\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$")
(define %write-pkg-file-form (define %write-pkg-file-form
`(progn `(progn
(require 'lisp-mnt) (require 'lisp-mnt)
@ -188,16 +186,8 @@ locations in the store in '.el' files."
;; raises an error if version is invalid ;; raises an error if version is invalid
(and (version-to-list version) version)) (and (version-to-list version) version))
(error "0.0.0")) (error "0.0.0"))
(or (save-excursion (or (lm-summary) package--default-summary)
(goto-char (point-min)) (lm-package-requires)
(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 " ")))))
:kind 'single :kind 'single
:url (lm-homepage) :url (lm-homepage)
:keywords (lm-keywords-list) :keywords (lm-keywords-list)