From patchwork Wed Jan 6 17:42:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tim Howes X-Patchwork-Id: 26249 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 C067927BC0F; Wed, 6 Jan 2021 17:43:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 40E2B27BC0E for ; Wed, 6 Jan 2021 17:43:15 +0000 (GMT) Received: from localhost ([::1]:44580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxCq2-0003OH-C8 for patchwork@mira.cbaines.net; Wed, 06 Jan 2021 12:43:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxCpq-0003Nl-4f for guix-patches@gnu.org; Wed, 06 Jan 2021 12:43:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxCpp-00040F-TM for guix-patches@gnu.org; Wed, 06 Jan 2021 12:43:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kxCpp-0004jG-RE for guix-patches@gnu.org; Wed, 06 Jan 2021 12:43:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45697] [PATCH] * gnu/packages/node.scm (libnode): Delete patch-node-shebang. Resent-From: Tim Howes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Jan 2021 17:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45697 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45697@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160995495918148 (code B ref -1); Wed, 06 Jan 2021 17:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jan 2021 17:42:39 +0000 Received: from localhost ([127.0.0.1]:45424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxCpT-0004ie-21 for submit@debbugs.gnu.org; Wed, 06 Jan 2021 12:42:39 -0500 Received: from lists.gnu.org ([209.51.188.17]:38348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxCpQ-0004iV-Ib for submit@debbugs.gnu.org; Wed, 06 Jan 2021 12:42:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxCpQ-0003DP-AX for guix-patches@gnu.org; Wed, 06 Jan 2021 12:42:36 -0500 Received: from lavabit.com ([38.147.122.66]:15431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxCpO-0003x3-Fy for guix-patches@gnu.org; Wed, 06 Jan 2021 12:42:36 -0500 Received: from localhost.localdomain (158-51-81-84.pool.common.net [158.51.81.84]) by lavabit.com with ESMTP id 9KHVXBVD6JK6 for ; Wed, 06 Jan 2021 11:42:32 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lavabit.com; s=bazinga; t=1609954952; bh=WLPftkEUJZdLgBQATXIu4TsuYpHEbEaNOLi4HmW7F4o=; h=From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Type:Content-Transfer-Encoding; b=FMXrsSBFadr3nwiOxGoLzg43XWLmmIiFzwknowtHtDa+NvHFAUgN6giAQ1b7VjDBA /34Z/u0rlK83iLw/aDRBGohDzGtsgeZLJ4hq6GLIhdlJP4SpLb63JWj8QzM7wYwYJa Cq4fPDu+PqKpVkhsVFrC3K8gFDUWtsDLhO0nW51pAfYbS4mf9DkfDKQk+NQisphknJ /k5mD2/EAnPyqjDTTYrfo7jNx0Bt9GXP35HC3mPbFrn6xVJdYL4ZzfPXx0dvMN4rfS ie7KncSbDoY6xiyaL243oCLjeqqNIuZHEL1Nt2hXh5a9xdvx4zsNRJDfDmNRLM+Iqw yDzhtRqj9Foqw== Date: Wed, 6 Jan 2021 09:42:15 -0800 Message-Id: <20210106174215.15245-1-timhowes@lavabit.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Received-SPF: pass client-ip=38.147.122.66; envelope-from=timhowes@lavabit.com; helo=lavabit.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Reply-to: Tim Howes , Tim Howes via Guix-patches X-Patchwork-Original-From: Tim Howes via Guix-patches via From: Tim Howes X-getmail-retrieved-from-mailbox: Patches [arguments]: Delete patch-node-shebang phase inherited from node. --- The build for libnode fails when it tries to run this phase. gnu/packages/node.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: f40ddf95a34944673cd6262b7aae0c643e653ff9 diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 9e07cd906e..687b5590ab 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2021 Tim Howes ;;; ;;; This file is part of GNU Guix. ;;; @@ -238,4 +239,5 @@ devices.") `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (delete 'patch-npm-shebang))))))) + (delete 'patch-npm-shebang) + (delete 'patch-node-shebang)))))))