summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves via Guix-patches via <guix-patches@gnu.org>2025-03-24 08:29:14 +0100
committerChristopher Baines <mail@cbaines.net>2025-04-12 11:23:56 +0100
commitd66a95e5f3a9df1de3e693a40ea809183b71da3c (patch)
tree671f7dd72639d0204225ecb34aaa00b56dc7185b
parent3b5db1ad864f0d8f8b021eaadad1205b6f9f6a52 (diff)
import: npm-binary: Improve-style.
* guix/import/binary.scm (resolve-package): Use and-let*. Change-Id: I41688c319ad4a6e73c04cb5bd4ed70365e6c7e4d Signed-off-by: Jelle Licht <jlicht@fsfe.org>
-rw-r--r--guix/import/npm-binary.scm12
1 files changed, 7 insertions, 5 deletions
diff --git a/guix/import/npm-binary.scm b/guix/import/npm-binary.scm
index f095651c34..60d7c07a8e 100644
--- a/guix/import/npm-binary.scm
+++ b/guix/import/npm-binary.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2019, 2020 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;; Copyright © 2020, 2023, 2024 Jelle Licht <jlicht@fsfe.org>
+;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -33,6 +34,7 @@
#:use-module (ice-9 regex)
#:use-module (json)
#:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-2)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-41)
#:use-module (srfi srfi-9)
@@ -158,11 +160,11 @@
(sort svs semver>?)))
(define* (resolve-package name #:optional (svr *semver-range-any*))
- (let ((meta (lookup-meta-package* name)))
- (and meta
- (let* ((version (semver-latest (or (meta-package-versions meta) '()) svr))
- (pkg (meta-package-package meta version)))
- pkg))))
+ (and-let*
+ ((meta (lookup-meta-package* name))
+ (version (semver-latest (or (meta-package-versions meta) '()) svr))
+ (pkg (meta-package-package meta version)))
+ pkg))
;;;