guix_mirror_bot pushed a commit to branch master
in repository guix.
commit add1279b7bf236f1b8db14538550a5a914144389
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Tue Jun 9 21:11:17 2026 +0900
import: npm-binary: Warn instead of crash when package spec fails resolving.
* guix/import/npm-binary.scm (npm-package->package-sexp): Issue a warning
when
resolving the package specification failed.
(npm-package->package-sexp) <resolved-deps>: Filter out #f values.
Change-Id: Idb2c1dd31feb9f1f7b05f3f85760ccb6d2a3f1f0
---
guix/import/npm-binary.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/guix/import/npm-binary.scm b/guix/import/npm-binary.scm
index 18a80876c4..2cbd23ed02 100644
--- a/guix/import/npm-binary.scm
+++ b/guix/import/npm-binary.scm
@@ -30,6 +30,7 @@
#:use-module (guix import json)
#:use-module (guix import utils)
#:use-module (guix memoization)
+ #:use-module (guix ui)
#:use-module (guix utils)
#:use-module (ice-9 match)
#:use-module (ice-9 receive)
@@ -226,7 +227,10 @@ associated Git repository, if available."
(define resolve-spec
(match-lambda
(($ <versioned-package> name version)
- (resolve-package name (string->semver-range version)))))
+ (let ((pkg (resolve-package name (string->semver-range version))))
+ (unless pkg
+ (warning (G_ "failed to resolve dependency ~a~%") name))
+ pkg))))
(define (github-hosted? url)
(let ((uri (string->uri url)))
@@ -327,8 +331,8 @@ associated Git repository, if available."
(sanitize-home-page-url home-page)
(string-append %default-page "/" (uri-encode
name))))
(synopsis description)
- (resolved-deps (map resolve-spec
- (append dependencies peer-dependencies)))
+ (resolved-deps (filter-map resolve-spec
+ (append dependencies
peer-dependencies)))
(peer-names (map versioned-package-name peer-dependencies))
(dev-names (append (map versioned-package-name dev-dependencies)
peer-names))
