import: elpa: Updater provides input list.
* guix/import/elpa.scm (elpa-dependency->upstream-input): New procedure. (latest-release): Add 'inputs' field. * tests/elpa.scm ("package-latest-release"): New test.master
parent
a738c1a0c7
commit
d46d1bee1e
|
@ -272,6 +272,25 @@ the package named PACKAGE-NAME."
|
||||||
(assq-ref recipe ':fetcher))
|
(assq-ref recipe ':fetcher))
|
||||||
#f)))
|
#f)))
|
||||||
|
|
||||||
|
(define (elpa-dependency->upstream-input dependency)
|
||||||
|
"Convert DEPENDENCY, an sexp as returned by 'elpa-package-inputs', into an
|
||||||
|
<upstream-input>."
|
||||||
|
(match dependency
|
||||||
|
((name version)
|
||||||
|
(and (not (emacs-standard-library? (symbol->string name)))
|
||||||
|
(upstream-input
|
||||||
|
(name (symbol->string name))
|
||||||
|
(downstream-name (elpa-guix-name name))
|
||||||
|
(type 'propagated)
|
||||||
|
(min-version (if (pair? version)
|
||||||
|
(string-join (map number->string version) ".")
|
||||||
|
#f))
|
||||||
|
(max-version (match version
|
||||||
|
(() #f)
|
||||||
|
((_) #f)
|
||||||
|
((_ _) #f)
|
||||||
|
(_ min-version))))))))
|
||||||
|
|
||||||
(define default-files-spec
|
(define default-files-spec
|
||||||
;; This contains more than just the things contained in %default-include and
|
;; This contains more than just the things contained in %default-include and
|
||||||
;; %default-exclude, presumably because this includes source files (*.in,
|
;; %default-exclude, presumably because this includes source files (*.in,
|
||||||
|
@ -421,12 +440,19 @@ type '<elpa-package>'."
|
||||||
(elpa-version->string raw-version))))
|
(elpa-version->string raw-version))))
|
||||||
(url (match info
|
(url (match info
|
||||||
((_ raw-version reqs synopsis kind . rest)
|
((_ raw-version reqs synopsis kind . rest)
|
||||||
(package-source-url kind name version repo)))))
|
(package-source-url kind name version repo))))
|
||||||
|
(inputs (match info
|
||||||
|
((name raw-version reqs . _)
|
||||||
|
(filter-map elpa-dependency->upstream-input
|
||||||
|
(if (eq? 'nil reqs)
|
||||||
|
'()
|
||||||
|
reqs))))))
|
||||||
(upstream-source
|
(upstream-source
|
||||||
(package (package-name package))
|
(package (package-name package))
|
||||||
(version version)
|
(version version)
|
||||||
(urls (list url))
|
(urls (list url))
|
||||||
(signature-urls (list (string-append url ".sig"))))))))
|
(signature-urls (list (string-append url ".sig")))
|
||||||
|
(inputs inputs))))))
|
||||||
|
|
||||||
(define elpa-repository
|
(define elpa-repository
|
||||||
(memoize
|
(memoize
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
|
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
|
||||||
;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2020, 2023 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
|
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
|
||||||
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
|
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
|
||||||
;;;
|
;;;
|
||||||
|
@ -21,6 +21,8 @@
|
||||||
|
|
||||||
(define-module (test-elpa)
|
(define-module (test-elpa)
|
||||||
#:use-module (guix import elpa)
|
#:use-module (guix import elpa)
|
||||||
|
#:use-module (guix upstream)
|
||||||
|
#:use-module ((guix download) #:select (url-fetch))
|
||||||
#:use-module (guix tests)
|
#:use-module (guix tests)
|
||||||
#:use-module (guix tests http)
|
#:use-module (guix tests http)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
|
@ -40,8 +42,20 @@
|
||||||
(auctex .
|
(auctex .
|
||||||
[(11 88 6)
|
[(11 88 6)
|
||||||
nil "Integrated environment for *TeX*" tar
|
nil "Integrated environment for *TeX*" tar
|
||||||
((:url . "http://www.gnu.org/software/auctex/"))])))
|
((:url . "http://www.gnu.org/software/auctex/"))])
|
||||||
|
(taxy-magit-section .
|
||||||
|
[(0 12 2)
|
||||||
|
((emacs
|
||||||
|
(26 3))
|
||||||
|
(magit-section
|
||||||
|
(3 2 1))
|
||||||
|
(taxy
|
||||||
|
(0 10)))
|
||||||
|
"View Taxy structs in a Magit Section buffer" tar
|
||||||
|
((:url . "https://github.com/alphapapa/taxy.el")
|
||||||
|
(:keywords "lisp"))])))
|
||||||
|
|
||||||
|
|
||||||
(test-begin "elpa")
|
(test-begin "elpa")
|
||||||
|
|
||||||
(define (eval-test-with-elpa pkg)
|
(define (eval-test-with-elpa pkg)
|
||||||
|
@ -73,6 +87,36 @@
|
||||||
(test-assert "elpa->guix-package test 1"
|
(test-assert "elpa->guix-package test 1"
|
||||||
(eval-test-with-elpa "auctex"))
|
(eval-test-with-elpa "auctex"))
|
||||||
|
|
||||||
|
(test-equal "package-latest-release"
|
||||||
|
(list '("https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar")
|
||||||
|
'("https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar.sig")
|
||||||
|
(list (upstream-input
|
||||||
|
(name "magit-section")
|
||||||
|
(downstream-name "emacs-magit-section")
|
||||||
|
(type 'propagated)
|
||||||
|
(min-version "3.2.1")
|
||||||
|
(max-version min-version))
|
||||||
|
(upstream-input
|
||||||
|
(name "taxy")
|
||||||
|
(downstream-name "emacs-taxy")
|
||||||
|
(type 'propagated)
|
||||||
|
(min-version "0.10")
|
||||||
|
(max-version #f))))
|
||||||
|
(with-http-server `((200 ,(object->string elpa-mock-archive)))
|
||||||
|
(parameterize ((current-http-proxy (%local-url)))
|
||||||
|
(define source
|
||||||
|
(package-latest-release
|
||||||
|
(dummy-package "emacs-taxy-magit-section"
|
||||||
|
(version "0.0.0")
|
||||||
|
(source (dummy-origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri "https://elpa.gnu.org/xyz"))))
|
||||||
|
(list %elpa-updater)))
|
||||||
|
|
||||||
|
(list (upstream-source-urls source)
|
||||||
|
(upstream-source-signature-urls source)
|
||||||
|
(upstream-source-inputs source)))))
|
||||||
|
|
||||||
(test-equal "guix-package->elpa-name: without 'upstream-name' property"
|
(test-equal "guix-package->elpa-name: without 'upstream-name' property"
|
||||||
"auctex"
|
"auctex"
|
||||||
(guix-package->elpa-name (dummy-package "emacs-auctex")))
|
(guix-package->elpa-name (dummy-package "emacs-auctex")))
|
||||||
|
|
Reference in New Issue