From patchwork Mon Mar 24 07:29:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 40767 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B84E127BBE2; Mon, 24 Mar 2025 07:30:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 56E9727BBE9 for ; Mon, 24 Mar 2025 07:30:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twcG6-0004dn-IH; Mon, 24 Mar 2025 03:30:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twcG4-0004dN-Aj for guix-patches@gnu.org; Mon, 24 Mar 2025 03:30:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twcG4-0002zg-1o for guix-patches@gnu.org; Mon, 24 Mar 2025 03:30:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ahppLY7wP6vtk4yEKfbzLbM1y1gSH4P8F8gkjF/JFsM=; b=PXdNFg44z7wtUtwGwdk01sfH0H/C85gR3EFLkWxYD+WRBzUtdTKhJmmQkXdOnCTLX97spK7YqkughCtMn/dCkGVS6v+LAJzQB8GD1vjNzYdCiFqh1Rb8SNtFf6w5IHdddfU9N3eJ9krvrr4TRUtHwZZlcUOuZUC+bASBRfd5iDEHueRpGffN+2XaJle515qG8TOcVTwEiHKDj0GAEjoJYyBFf+R6IGiWQeYl97JJA6PAEnsHCeTTHHSnjQomP5C9Qr/qUjjg4xOMBby3u6lx7lCoF6DCCivv2v82I7O0BizF03LCzsX/f5FuQa9V6zQJKOH4OmHAdHiDcnLOajYoSA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1twcG3-0005V0-Sj for guix-patches@gnu.org; Mon, 24 Mar 2025 03:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77231] [PATCH 3/6] import: npm-binary: Improve-style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Mar 2025 07:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77231 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77231@debbugs.gnu.org Cc: jelle.licht@fsfe.org, Nicolas Graves Received: via spool by 77231-submit@debbugs.gnu.org id=B77231.174280138121026 (code B ref 77231); Mon, 24 Mar 2025 07:30:03 +0000 Received: (at 77231) by debbugs.gnu.org; 24 Mar 2025 07:29:41 +0000 Received: from localhost ([127.0.0.1]:53979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1twcFh-0005T3-C2 for submit@debbugs.gnu.org; Mon, 24 Mar 2025 03:29:41 -0400 Received: from 9.mo563.mail-out.ovh.net ([46.105.73.201]:42467) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1twcFX-0005SB-Tu for 77231@debbugs.gnu.org; Mon, 24 Mar 2025 03:29:33 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZLl6y2jH9z1XFj; Mon, 24 Mar 2025 07:29:30 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77231@debbugs.gnu.org>; Mon, 24 Mar 2025 07:29:30 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.9.138]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZLl6y2MH1zy6K; Mon, 24 Mar 2025 07:29:30 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id C57E12638EC; Mon, 24 Mar 2025 07:29:29 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003d64d6f2f-1459-42bc-9a0f-74bc7f221487, AEA14DA1325383AAD40887B56448FDDF9DC3A193) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Mon, 24 Mar 2025 08:29:14 +0100 Message-ID: <20250324072925.19588-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250324072925.19588-1-ngraves@ngraves.fr> References: <20250324072925.19588-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 709879893600035554 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduheeludejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopeefpdhrtghpthhtohepjeejvdefudesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehjvghllhgvrdhlihgthhhtsehfshhfvgdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=ahppLY7wP6vtk4yEKfbzLbM1y1gSH4P8F8gkjF/JFsM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1742801370; v=1; b=mZzn7VuWHTM0MsGW5R7JNki0pqZ+Wl4JeTJm67BBv8EFQ/6dWeEkbCOOWrE1MsUuimu8EUwu 72vfhZE6vKVVQGUnasnm0BBncJUq5NNZBqIfsLC/8WEm/wUvH0I9b0HsHGc1sQ4tQHaKZnWxmXR iNGWMrQvw4qyduSo7incTgOSDIO2rJnlKO7LtTgz44ZombSEQcapzrKTftBDQl/glQ13lLPLaj3 BJeEdkZhTOM6i+ofwirpVwFOUVzSJjRJVJiEwlziQ4VkYpz+eLjMyFQ2JY5kDuKJ22yTUyCq6Nc Dyb6GFbbmXJ77kkXhHSsorAYU8qmX3A36Rqf6DAaVdVPw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/binary.scm (resolve-package): Use and-let*. --- 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 ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2020, 2023, 2024 Jelle Licht +;;; Copyright © 2025 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (define-module (guix import npm-binary) #: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 @@ (define* (semver-latest svs #:optional (svr *semver-range-any*)) (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)) ;;;