From patchwork Thu Dec 30 07:38:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 35776 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 83D3127BBEA; Thu, 30 Dec 2021 07:43:50 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 4CE5227BBE9 for ; Thu, 30 Dec 2021 07:43:50 +0000 (GMT) Received: from localhost ([::1]:55794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n2q6H-0000rS-H5 for patchwork@mira.cbaines.net; Thu, 30 Dec 2021 02:43:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2q4d-0007Ti-Bs for guix-patches@gnu.org; Thu, 30 Dec 2021 02:42:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n2q4d-00083z-1T for guix-patches@gnu.org; Thu, 30 Dec 2021 02:42:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n2q4c-0006a8-Vj for guix-patches@gnu.org; Thu, 30 Dec 2021 02:42:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v6 15/41] gnu: node-once: Use 'delete-dependencies'. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Dec 2021 07:42:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Timothy Sample , Pierre Langlois , Jelle Licht , Philip McGrath , Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.164085011525180 (code B ref 51838); Thu, 30 Dec 2021 07:42:06 +0000 Received: (at 51838) by debbugs.gnu.org; 30 Dec 2021 07:41:55 +0000 Received: from localhost ([127.0.0.1]:50993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2q4Q-0006Xz-Km for submit@debbugs.gnu.org; Thu, 30 Dec 2021 02:41:54 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:45719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2q4K-0006Wc-0P for 51838@debbugs.gnu.org; Thu, 30 Dec 2021 02:41:48 -0500 Received: by mail-qt1-f182.google.com with SMTP id p19so20987682qtw.12 for <51838@debbugs.gnu.org>; Wed, 29 Dec 2021 23:41:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NIU8UcgMm+9FOaM5dG2UMVcitf8acoZ/HRfS6zhUHB4=; b=QZGVijNA1hMSTfZXflZrZYbeE4OXBoQeVEQ2ELvrgoVtO31MCx4Kkmd5g+GluUVe/+ b71gPERwM0QIwMuueg9SkRqquX61471RnegMzovDhd5mwsFpsn+Vx29z0gmRsRUZircJ /8pdCGWWn+N53tQizH08rFgLKD0FoCaFAkwC0Q3YeRWbTVTvmyInAY6D6f6cYPsrAgeU r4kFZguKH4nph2DQxUbDdCp/e7A6s4++HH/Y347xxRyMCSQkCMkz+Ij4BvuL7i8lSQZZ 585pSfQYUcTidblOQUByMCqe0XDyOFaLFx6M0r0Pbb1aS4YGY78w5ahomC72Xzlb6mKI lsjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NIU8UcgMm+9FOaM5dG2UMVcitf8acoZ/HRfS6zhUHB4=; b=4opMCGktm5NIXnu1fQap9OEqI23z3G3bJYPxJt4GCFJFq3ddeJJeXZQb/7V469Q8NN d+GScwbtGZZJ/xiO4zKgYpgwmqWRrNRagrpe88CqG3GkgE8UvL+k+28Wgy+9rbKW8C0X zgpldgA/NrTuR4NHR0cDskVN+bpi7bzemBgRT9uvHMJMycqOnsXQ3hNchvohCbtfM+bT IiSfsx1Fm5A4TEP5pSWU//+P3am16ufHxqSBb7S7AvioSf8aMjn5Yo0AFdeUKyJHbDgy 2s27X/4sevupxbxyySMCxQClTK6dbxUWUWykghQuMtx9b3uRoWeJdXzKqRwsHBiwfq8+ DAiw== X-Gm-Message-State: AOAM532HQaVE2OTZuPx8eyrmowj3d3sCbOqTn7FB3xbNNxVUNc5PsYx+ YQt/2Jxg2lMqdvGEygrrSlap8aQ5MxboSff0 X-Google-Smtp-Source: ABdhPJwkzw9QMtdjW2/CKpgCzaSvfp0+yY429cZ6dN1X2I/ocCqXVODLlr56qUJUfgZeqCDVQqNDGQ== X-Received: by 2002:ac8:7dc9:: with SMTP id c9mr25849827qte.541.1640850102490; Wed, 29 Dec 2021 23:41:42 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with UTF8SMTPSA id q6sm14264507qke.61.2021.12.29.23.41.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Dec 2021 23:41:42 -0800 (PST) From: Philip McGrath Date: Thu, 30 Dec 2021 02:38:53 -0500 Message-Id: <20211230073919.30327-16-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230073919.30327-1-philip@philipmcgrath.com> References: <082a81964a43ae5f735ad2ca433d0dfe00859c35.camel@gmail.com> <20211230073919.30327-1-philip@philipmcgrath.com> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node-xyz.scm (node-once)[arguments]: Use 'delete-dependencies'. Stop deleting the 'configure' phase. --- gnu/packages/node-xyz.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index da855cb16e..ef251c07bf 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -347,13 +347,15 @@ (define-public node-once "1z8dcbf28dqdcp4wb0c53wrs90a07nkrax2c9kk26dsk1dhrnxav")))) (build-system node-build-system) (arguments - '(#:tests? #f ; FIXME: tests depend on node-tap - #:phases + '(#:phases (modify-phases %standard-phases - ;; The default configure phase fails due to tap being missing, as we do - ;; not have tap packaged yet. It is used only for tests. This package - ;; still works as a dependency of node-glob and node-inflight. - (delete 'configure)))) + (add-after 'patch-dependencies 'delete-dependencies + (lambda args + (with-atomic-json-file-replacement "package.json" + (lambda (pkg-meta) + (delete-dependencies pkg-meta '("tap"))))))) + ;; FIXME: Tests depend on node-tap + #:tests? #f)) (inputs (list node-wrappy)) (home-page "https://github.com/isaacs/once")