andreas pushed a commit to branch master
in repository guix.
commit 8aca24f41e6e5e0af9b38c27685515ea8c9ed1e7
Author: Nicolas Graves via Guix-patches via <guix-patc...@gnu.org>
AuthorDate: Mon Mar 24 08:29:14 2025 +0100
import: npm-binary: Improve-style.
* guix/import/binary.scm (resolve-package): Use and-let*.
Change-Id: I41688c319ad4a6e73c04cb5bd4ed70365e6c7e4d
Signed-off-by: Jelle Licht <jli...@fsfe.org>
---
guix/import/npm-binary.scm | 12 +++++++-----
1 file 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 <samp...@ngyro.com>
;;; Copyright © 2021 Lars-Dominik Braun <l...@6xq.net>
;;; Copyright © 2020, 2023, 2024 Jelle Licht <jli...@fsfe.org>
+;;; Copyright © 2025 Nicolas Graves <ngra...@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))
;;;
