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 ms9.migadu.com with LMTPS id 0DeGEmSBJWSPFQEASxT56A (envelope-from ) for ; Thu, 30 Mar 2023 14:32:36 +0200 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 mJmZEWSBJWRWMgEAG6o9tA (envelope-from ) for ; Thu, 30 Mar 2023 14:32:36 +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 1EE3111470 for ; Thu, 30 Mar 2023 14:32:36 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrRp-0000vH-8i; Thu, 30 Mar 2023 08:32:09 -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 1phrRk-0000tu-8U for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:04 -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 1phrRk-0001kn-03 for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrRj-0002vQ-RL for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 03/19] gnu: node-acorn: Remove lifecycle script. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:32: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.168017951911182 (code B ref 59188); Thu, 30 Mar 2023 12:32:03 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:31:59 +0000 Received: from localhost ([127.0.0.1]:56000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRf-0002u7-60 for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:59 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:35440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRc-0002tU-Ka for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179516; 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=cZKPAMCck5/oi9QEia2Z8Ug8OTaaNtbrkxvMmEbw9wY95Clm3vdb+w2FJSH+pSayzVKZZc gNbkGSUO43SFOi4dHERCaUQZP8JKnFL8MRXbni9gww2pzROS6hcMng944H9ynLWccPQskM rQ0Yqs8Smn8e8LxaZfSI2QQEGicdyak= Date: Thu, 30 Mar 2023 14:31:34 +0200 Message-Id: <94d6260e7ee309d2075856f0c0340a91a087e58f.1680179491.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=cZKPAMCc; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680179556; 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=YGz2nA4y2dUjYapwODxu7uf7zMV/FiAIBD11zHuP6yVCJIbk6PlJ+1MrP14cw4VH7sUnFv Gel+0uh7kf3QI5LIewjaJSnHLWxEuTV6q0FvOq+W6FKWdfVW3b5GWheqI6IPctZMkndKwC NlHkoux8F6FFgm8ADT/fq3D4qQxMTcfM/YJTZ8CqcLS6oiiNPXD9O2/IeSRtiVUe6PK+bk QwhSfipReG7iNlWF0/XEwM6+aJ61QFu0bGkkWhINrJKMFIh42FQqvWZvXkS+MpH1XM/Zo7 DsZ+7XcfB7Ixwd+PHcMs3Yg0mylqESE155J6VaMvXpjt5YI2bat6c/AfHFd3SA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680179556; a=rsa-sha256; cv=none; b=Aqk8+pfyK+PGIhBWeIvb6TbWXOM7ZyU8J/HCc+O3cQ1E4yITOZzThsK3B0KyQ5UQ+A9XbV U9gpzE8akwZturnzZ11NdryX8KX/achWndYi4sRW4b0itqOqTTsmi8o1+1rzlXOiuLxh5p H7O6ajZL+yFxMOJ9eCqUL6U/SipuosPGGggkWTIOz+RAh68pqGkb9MOFJckq5OIVY7h/MC y9MWNqA5r7DKUvKEt9NIuYRTb9KK6o6EOK45gKVYmKUMrLwBj6NJxaB5iBHzqpIF11DtoI ORSxqIqPnH+CR/4wuacLVje+7IMEN2z0/b14aOENKbqt3Z1yDS+XOy+jJqtVig== X-Migadu-Spam-Score: 7.28 X-Migadu-Scanner: scn1.migadu.com X-Migadu-Queue-Id: 1EE3111470 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=cZKPAMCc; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fsfe.org (policy=none) X-Spam-Score: 7.28 X-TUID: Rg5H/Uu2PBkb 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