From patchwork Wed Feb 8 21:05:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 46746 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 AE51F1643B; Wed, 8 Feb 2023 21:06:16 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 D481E163FD for ; Wed, 8 Feb 2023 21:06:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPrdk-0004m1-Ai; Wed, 08 Feb 2023 16:06:04 -0500 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 1pPrdi-0004k9-JB for guix-patches@gnu.org; Wed, 08 Feb 2023 16:06:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pPrdi-0006DQ-AN for guix-patches@gnu.org; Wed, 08 Feb 2023 16:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPrdi-00045K-5g for guix-patches@gnu.org; Wed, 08 Feb 2023 16:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v3 02/16] gnu: node-acorn: Remove lifecycle script. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Feb 2023 21:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.167589033815467 (code B ref 59188); Wed, 08 Feb 2023 21:06:02 +0000 Received: (at 59188) by debbugs.gnu.org; 8 Feb 2023 21:05:38 +0000 Received: from localhost ([127.0.0.1]:56749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdK-00041D-4s for submit@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:38 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:40972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPrdH-00040e-Iy for 59188@debbugs.gnu.org; Wed, 08 Feb 2023 16:05:36 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1675890335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hhzxt0i/LFXqvjXxTiOPWsH74rPHLWDQrcS4sqM7yDU=; b=QRTkGThE0LYiCIumV9lvpuJ86qZBvt+n3xYkr6PdOGJNM77eK2S3+T6a/h6uGd8re4vzXK rk0/3bQMQRSi7AzkSlIQwJ1lrsb0klZrmLNbJue1ggcxEg2IJSW6yKiLU5h8TEMsSniapB YMQxF7XEMqCJvDMLJ4HcxT7OcfnTyZU= Date: Wed, 8 Feb 2023 22:05:17 +0100 Message-Id: <3b7434500d34c7401fbfbc5221f83dadf53f8406.1675889756.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: New argument. : Patch out unused 'prepare' script that breaks dependents. --- gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 51ea110e8c..5e7e6ae4d9 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -47,11 +47,35 @@ (define-public node-acorn (build-system node-build-system) (arguments '(#:tests? #f + #:modules + ((guix build node-build-system) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "acorn")))))) + (chdir "acorn"))) + (add-before 'configure 'avoid-prepare-scripts + (lambda _ + ;; We need to remove the prepare script from "package.json", as + ;; it would try to use the build environment and would block the + ;; automatic building by other packages making use of node-acorn. + ;; TODO: Add utility function + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . pkg-meta-alist) + (cons '@ (map (match-lambda + (("scripts" @ . scripts-alist) + `("scripts" @ ,@(filter (match-lambda + (("prepare" . _) + #f) + (_ + #t)) + scripts-alist))) + (other other)) + pkg-meta-alist)))))))))) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an