mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
import: npm-binary: Improve npm-package->package-sexp.
* guix/import/npm-binary.scm (npm-package->package-sexp): Use record matching. Change-Id: If4e60162a84cb8d9694882eab933afa7028b02d7 Signed-off-by: Jelle Licht <jlicht@fsfe.org>
This commit is contained in:
parent
4b47728a6b
commit
23e001d9cb
1 changed files with 58 additions and 63 deletions
|
@ -196,16 +196,10 @@
|
||||||
(($ <versioned-package> name version)
|
(($ <versioned-package> name version)
|
||||||
(resolve-package name (string->semver-range version)))))
|
(resolve-package name (string->semver-range version)))))
|
||||||
|
|
||||||
(if (package-revision? npm-package)
|
(match npm-package
|
||||||
(let ((name (package-revision-name npm-package))
|
(($ <package-revision>
|
||||||
(version (package-revision-version npm-package))
|
name version home-page dependencies dev-dependencies
|
||||||
(home-page (package-revision-home-page npm-package))
|
peer-dependencies license description dist)
|
||||||
(dependencies (package-revision-dependencies npm-package))
|
|
||||||
(dev-dependencies (package-revision-dev-dependencies npm-package))
|
|
||||||
(peer-dependencies (package-revision-peer-dependencies npm-package))
|
|
||||||
(license (package-revision-license npm-package))
|
|
||||||
(description (package-revision-description npm-package))
|
|
||||||
(dist (package-revision-dist npm-package)))
|
|
||||||
(let* ((name (npm-name->name name))
|
(let* ((name (npm-name->name name))
|
||||||
(url (dist-tarball dist))
|
(url (dist-tarball dist))
|
||||||
(home-page (if (string? home-page)
|
(home-page (if (string? home-page)
|
||||||
|
@ -258,7 +252,8 @@
|
||||||
(map (match-lambda (($ <package-revision> name version)
|
(map (match-lambda (($ <package-revision> name version)
|
||||||
(list name (semver->string version))))
|
(list name (semver->string version))))
|
||||||
resolved-deps))))
|
resolved-deps))))
|
||||||
(values #f '())))
|
(_
|
||||||
|
(values #f '()))))
|
||||||
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue