From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id oMhaGYJmPWSdZAAASxT56A (envelope-from ) for ; Mon, 17 Apr 2023 17:32:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id uIJrGIJmPWR97wAAG6o9tA (envelope-from ) for ; Mon, 17 Apr 2023 17:32:18 +0200 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 283733EBEC for ; Mon, 17 Apr 2023 17:32:18 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQD7-0003XB-6q; Mon, 17 Apr 2023 10:52:05 -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 1poQD5-0003We-PN for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 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 1poQD5-0005R7-Hb for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD5-0008WE-C6 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 03/20] gnu: node-acorn: Remove lifecycle script. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52:03 +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.168174309432508 (code B ref 59188); Mon, 17 Apr 2023 14:52:03 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:34 +0000 Received: from localhost ([127.0.0.1]:55639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCc-0008SG-98 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:34 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCV-0008RF-OC for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:28 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743087; 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=R57KdZ9IXvfnzcde2tfINxHFrdh64sPu7+J20XdP8mM=; b=piNqqPkqXBkLpzzSOK3JPtQzAqQ59/Q1SvsSvmlzt6SBPDi4mJasTGlXsNFoyPGZOtKIcm 1hocpG0D0aN8wQFtnncBBqsdRdaHNIXk5IYIMNNw0IuoWMX7Ayb26KtvrFKfhcZUNeE0Hl 7xlqoda1cTE+YCpy4XBThxiPfrNpqSI= Date: Mon, 17 Apr 2023 16:51:05 +0200 Message-Id: <00e6ff270ed168911261ff7718e36d73ee000e6a.1681742871.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-Flow: FLOW_IN X-Migadu-Country: US ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=piNqqPkq; 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=1681745538; a=rsa-sha256; cv=none; b=fwlhMswXnGSOiH8O4DhkVqYlIWs2tPK6XEC2i17Y5d801t5iOHKJfyVNb1jpdVmy1U53iw 5hEi7VdCOMOrQal9rwFdVCEFPoc9hfFH4ueArK7HPRvnf8TpT4GCeObHNnQ0sABCo7aF+Z ih8sg3UhYujVkmHaANjkLVY+gztc/kknLcGwCrOjRvQv4LtfBTyStDufZI3r+VtW8ItTgL 4Vbp5kdUKsOC7flFhbBVfGgYdk7zGFHK00rryKPMq9Jjr2p3JYvVdu+xxxSMiK1QOHpuIt maGEgTn8pfb96NoQxMXEhFMDxTHZXOsoPDhFKtbJBrEaApLkFavsHhcfTe6EAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681745538; 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=R57KdZ9IXvfnzcde2tfINxHFrdh64sPu7+J20XdP8mM=; b=m1NbxDvL7t82LgpQ4Ar0MRm4BpzrCQd5Z0PHypOGMSEN5/OtAmPxBw33NVM3GmRN3o4Iwj 1RXrC7jZuIdkDCGuegYpoqAi8qQH6+MbxsiZ3JXr8seS7kvSPAsTtLl16YhY6YprqMDcsl A/mtHm0Vp8keXJx85D3qPpc1T+zJW5MlBEpguf42uuX0bp+GHpSuf3gdmteAJdToIcae3x SBQXR5zetJPq+a6Ya1WeIRdt1qaJrzdgvXeTd+j1Spw7DwzNvJyhygsRUqBnNtAfSd4c8W giUVorlCoILbsi/ukZ9SMGV1F+0LuXKSzXbWawIBg1oqdkgudTuLH2qdaMPrUQ== X-Migadu-Spam-Score: 6.99 X-Spam-Score: 6.99 X-Migadu-Queue-Id: 283733EBEC Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=piNqqPkq; 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-Migadu-Scanner: scn0.migadu.com X-TUID: AdvAZ+G03olE From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: New argument. : Patch out unused 'prepare' script that breaks dependents. --- (no changes since v1) 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 e89117beca..e3d8c7ca19 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.2