From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 0LFsDM0V5GPMzAAAbAwnHQ (envelope-from ) for ; Wed, 08 Feb 2023 22:36:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 8HuIC80V5GNtUQEAG6o9tA (envelope-from ) for ; Wed, 08 Feb 2023 22:36:13 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BDF10AFA7 for ; Wed, 8 Feb 2023 22:36:12 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=QRTkGThE; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675892173; a=rsa-sha256; cv=none; b=kygRxVzFaifhJ/kaS6cjXXRCtZhJudYG2VTpTbuBsa+LFC/jrph+SctgDJQBxxqkySI86b 62ZdmPYYUc/kDChpPepvlhtnaoSPGbobZ8gxgza0p4KAUtJF95grzsIhuUNZgmihP5/31Z K/kVQcrMtSmA8MKRKGUgCqB38CGVZISyL2eoURjYdGUOa1+qbIDSFMtISOKPZKvGOpgKOt K5RGgk7uHkHXh0gOkR5out0DWLMsm8nHHkjp2jZKcFkxUmGAnBnqrXr+rsscgkqoCl/HlR UVTMzehfq5S3kWOMWSaaQxQUpvuAre2XHS1jBue2iVH8J+uBJx8e5AHr+91MsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675892173; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Hhzxt0i/LFXqvjXxTiOPWsH74rPHLWDQrcS4sqM7yDU=; b=elMqT8NztQTqjyZLM9eBPt3D2kHsBZSndj422kcbRzB9bd0/HXURX/QFQ74pipfI7oRaz2 I6zHVQ9OYmE7cC9V44D3d6pTo4hsjSbJoRHvO+qXvBg5c7sq/F3PtwL7QVDNRjOnB8J6Ke fOoLX6F9bBEqejTJQJPdHQjSeCMNp4PcBrXyOgE1+ZbWQPwhsS0z3Ul0visipGRXOmfiVq 2pLR+h/ilADwcaS9b5eMAFkAvGrlHh+tFfIZ/y88QqaPMSBapHWndqO9pCk3LvxC1nxvyH kufatSLa+QWT3qKbiPfBDLJUYm0R2RSIalCwP3A4TOdEu2lCN2lBJSmvakTdog== X-Migadu-Queue-Id: BDF10AFA7 X-Migadu-Spam-Score: -0.50 X-Spam-Score: -0.50 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=QRTkGThE; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: 8vBgUvGP+HcM 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 -- 2.39.1