From patchwork Mon Mar 24 07:29:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 40768 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 EDFFC27BBEE; Mon, 24 Mar 2025 07:30:58 +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 6E7B627BBE9 for ; Mon, 24 Mar 2025 07:30:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twcGG-0004ro-Ec; Mon, 24 Mar 2025 03:30:16 -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 1twcG7-0004ed-KJ for guix-patches@gnu.org; Mon, 24 Mar 2025 03:30:07 -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 1twcG7-00030V-5l for guix-patches@gnu.org; Mon, 24 Mar 2025 03:30:07 -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=XbN0EE8476ZSsz55S3ha4fqP+n96z4ZE/RWmjAeWIW4=; b=WGyCLqqad18WGMZNjdTx7grdLEpeQAOMBAutODjQKB1FwSFAiWmqLe02kBkynY6//Q7a3NpcIDxEpa0PktukAyg4D0wNGDxWqyukelfdREBOmD6+i6nfEDOaOVijmosz1IcVR9gNOBpacc2ilfAixzzKkB3DvaPKJ4gphkppJygkDKk0prCYKs1DOGgwGL7Lrsri7kumHZJ/Jy5QPR4l5DG8REO/gQd7u4FBmpZUiQ8u8C2OyzaRx3z1QUAqh0ICMf/L9bqgaLxxIq3pNe8itjPfhKTtzQQYy+7OukZuH+5WygNAXqY0n+YtgL25VNNt3cb5IUh0ceUL1sAzGSIs/g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1twcG6-0005Va-V6 for guix-patches@gnu.org; Mon, 24 Mar 2025 03:30:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77231] [PATCH 6/6] import: npm-binary: Filter out npm-ignored-inputs. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Mar 2025 07:30:06 +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.174280138421069 (code B ref 77231); Mon, 24 Mar 2025 07:30:06 +0000 Received: (at 77231) by debbugs.gnu.org; 24 Mar 2025 07:29:44 +0000 Received: from localhost ([127.0.0.1]:53987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1twcFk-0005Tl-GG for submit@debbugs.gnu.org; Mon, 24 Mar 2025 03:29:44 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:54797) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1twcFc-0005SY-6o for 77231@debbugs.gnu.org; Mon, 24 Mar 2025 03:29:36 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZLl721n5Fz1Swq; Mon, 24 Mar 2025 07:29:34 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77231@debbugs.gnu.org>; Mon, 24 Mar 2025 07:29:33 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.145]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZLl716p8jz7wVq; Mon, 24 Mar 2025 07:29:33 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 76F14DA38EC; Mon, 24 Mar 2025 07:29:33 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-96R00174d24aa2-d6f9-4776-9228-92efbe66f1d2, AEA14DA1325383AAD40887B56448FDDF9DC3A193) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Mon, 24 Mar 2025 08:29:17 +0100 Message-ID: <20250324072925.19588-6-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: 710724317148406498 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduheeludekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepfedprhgtphhtthhopeejjedvfeduseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepjhgvlhhlvgdrlhhitghhthesfhhsfhgvrdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=XbN0EE8476ZSsz55S3ha4fqP+n96z4ZE/RWmjAeWIW4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1742801374; v=1; b=GF7RDG1L//B/KDnaYp0tNP4O62jhXiR0dh9PRRMHGnoUHNxXbT+lf/P1FBziui4DachaI4uH CCXk/str7XraykXeE6wurZZhOBatzVpivb4gI9VaKZ15SAao31v+0nPkNkRqb/VmyKOzq2eT5Rj HB2Q4NoKZiLF50e4fwXs0noo4J2zAZPX0ImACNsdcu/iipoAK/J8y+Lp35iQpvnOYnI+l9Pmy2h 1+MZVTHtdr3/NA+KyZtKe1U2PuNTWdWYhM6VDn871B4rhxybOyI01QQ77xAFWFbzF+R6h+GJrge QyeBYbD8Gd5wFeVnv2RGjcLZDSiPk8j6F4uWUZk+gVj4Q== 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/npm-binary.scm (npm-keep-input?): Add variable. (npm-package->package-sexp): Use npm-keep-input? to filter out unwanted inputs. --- guix/import/npm-binary.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/guix/import/npm-binary.scm b/guix/import/npm-binary.scm index 01079c2814..fed063f55d 100644 --- a/guix/import/npm-binary.scm +++ b/guix/import/npm-binary.scm @@ -24,6 +24,7 @@ (define-module (guix import npm-binary) #:use-module (gcrypt hash) #:use-module (gnu packages) #:use-module (guix base32) + #:use-module ((guix build node-build-system) #:select (npm-ignored-inputs)) #:use-module (guix http-client) #:use-module (guix import json) #:use-module (guix import utils) @@ -201,6 +202,16 @@ (define (package-revision->symbol package) (name (npm-name->name npm-name))) (name+version->symbol name version))) +(define (npm-keep-input? input) + "If INPUT is not among `npm-ignored-inputs', return it. Else return #f." + (match npm-ignored-inputs + (((ignored ...) (prefixes ...) . ()) + (let ((name (versioned-package-name input))) + (and (not (or (member name ignored) + (any (cut string-prefix? <> name) prefixes))) + input))) + (_ #f))) + (define (npm-package->package-sexp npm-package) "Return the `package' s-expression for an NPM-PACKAGE." (define resolve-spec @@ -218,6 +229,9 @@ (define resolve-spec home-page (string-append %default-page "/" (uri-encode name)))) (synopsis description) + (dependencies (filter-map npm-keep-input? dependencies)) + (dev-dependencies (filter-map npm-keep-input? dev-dependencies)) + (peer-dependencies (filter-map npm-keep-input? peer-dependencies)) (resolved-deps (map resolve-spec (append dependencies peer-dependencies))) (peer-names (map versioned-package-name peer-dependencies))