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 UK+0KM0XEWRLpwAASxT56A (envelope-from ) for ; Wed, 15 Mar 2023 01:56:45 +0100 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 uIThJ80XEWTxkwAAG6o9tA (envelope-from ) for ; Wed, 15 Mar 2023 01:56:45 +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 69DDC23AE1 for ; Wed, 15 Mar 2023 01:56:45 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=L42yJhuN; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678841805; 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=TLxTurVJGlJbWUAtaUe/+ybkxI4UY1odUt5XnEcP3L9LqnRekJFQZq/PXvHcsWgKQfwZQ9 7d7WTFK29J+0fJ3ewHK3AbZGQvLaI6buxFHbSb8TZlbiLMg6aylm6FDt4ntZo6J9X/BB+L Ibw7095oyxGn0McIkpmftTtXvUXrXOp5ZXJqzhQdVUNnDQX0fDNOzbcyl05atvN2FBmthn coxrZWyX6UvJMuU8/afscwgsMcGRXWTinGT6rOwZSJrTWBcDoIYi8K29Yho7kyEvuHHFbh NcmYrJNMPgjv7bv6LG9t20MZuMg50UhS6XWpyFxsSEdKOmOTY4CTPdN/ItWbMQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021100501 header.b=L42yJhuN; 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=1678841805; a=rsa-sha256; cv=none; b=K2Ri2X+bA2k9UXdTJR1oZQZ9Q86KF6uMgICWk79luFbMQbrBKAZ5+3+B7PWq5/LsOgsiG/ Om7b8tQlwBFwaSNKYEEhA61iyZPYK6KTLPutYWSXLKOq9Pe7wSyW+uh2w88w3MmqoJ8u8S 9Hx1iNeQ8XjZZU44ifbweTPjMCNtC3kIUpqa4BhI8zv27yHzUwBEjJLxat7i+/kxxLtXlA wn0uMtlP7sMAmiQnv9Gft7PHgoT88ZVDfCGunvdrfiDQf7lpoTrVe+t/wq621HhUNG2Nbb Tt1ni7NoW3BDNAJLKTd3ianQzIX98ysRdDu4jCQS1AFGZgXZfY+aEYnAmQC8Rg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR0-00081E-KY; Tue, 14 Mar 2023 20:56:06 -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 1pcFQy-0007zm-Uq for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -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 1pcFQx-00074Y-Dv for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQx-00027p-Ad for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 03/17] gnu: node-acorn: Remove lifecycle script. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56: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.16788417407940 (code B ref 59188); Wed, 15 Mar 2023 00:56:03 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:40 +0000 Received: from localhost ([127.0.0.1]:38739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023j-OQ for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:40 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQY-00023A-59 for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:38 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841737; 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=L42yJhuN0QGQM3TkmLbUFeTiPCK+SiU8Piy2K/L67db6Wq/egeaVk4UDCqCF8MXB/JDkC8 v+0pLeyt9zVP+UVXAQA1/wP+my5mBV62iKC5RYHAbmSWeaXREtD8VJlqCLn8njAKHbxl5Y YNjZGv/mM3iWygYZbojRUuYrbFbiosE= Date: Wed, 15 Mar 2023 01:55:18 +0100 Message-Id: <7b787f51f28d3b1d131ed2b21c8a3330f3e1e213.1678841648.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: X-Migadu-Queue-Id: 69DDC23AE1 X-Spam-Score: -2.03 X-Migadu-Spam-Score: -2.03 X-Migadu-Scanner: scn0.migadu.com 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 X-TUID: HzzxUufTdCmB 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