From patchwork Wed Dec 8 20:28:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 35032 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 5754627BBEA; Wed, 8 Dec 2021 20:30:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E4A0E27BBE9 for ; Wed, 8 Dec 2021 20:30:46 +0000 (GMT) Received: from localhost ([::1]:46028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mv3aQ-0007SL-2X for patchwork@mira.cbaines.net; Wed, 08 Dec 2021 15:30:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mv3Zz-0006lD-Rp for guix-patches@gnu.org; Wed, 08 Dec 2021 15:30:19 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mv3Zq-0000RS-If for guix-patches@gnu.org; Wed, 08 Dec 2021 15:30:19 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mv3Zq-00060f-FZ for guix-patches@gnu.org; Wed, 08 Dec 2021 15:30:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v3 19/43] guix: node-build-system: Add implicit libuv input. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Dec 2021 20:30:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163899536622708 (code B ref 51838); Wed, 08 Dec 2021 20:30:10 +0000 Received: (at 51838) by debbugs.gnu.org; 8 Dec 2021 20:29:26 +0000 Received: from localhost ([127.0.0.1]:41607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mv3Z4-0005tx-0C for submit@debbugs.gnu.org; Wed, 08 Dec 2021 15:29:22 -0500 Received: from mail-vk1-f175.google.com ([209.85.221.175]:43568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mv3Yq-0005pK-Hl for 51838@debbugs.gnu.org; Wed, 08 Dec 2021 15:29:15 -0500 Received: by mail-vk1-f175.google.com with SMTP id f7so2343180vkf.10 for <51838@debbugs.gnu.org>; Wed, 08 Dec 2021 12:29:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Snc6DwrRiD/cOxhQ9nOOo8DfqibULx1Ev/pz6Q2mgSA=; b=WRysdaSkoPu2sy0JfGlU10grTyIPMCGYTOWiHtkWTbpmICAF+oWwZAJr/KPJnTYM6/ PhoiPwWI/ln8rJPXSwGYqjp+bbm2GrGRaUMwF3j2aALqZ0SBMRAysmERaLOJoxXUTZ+8 3aI151H2HVLn4fyAgPjc1y1RqMx6lq8/q0A7xVBp9HUC0oUD5y+VT8aofPNvU13HT3N7 qV8nZ5d2kmZLQg2AkH+KFGGOyUtFzCG+x0ZKpqMM3OhBOB2hojHEQFtW8jewhVmxdpj4 1YqOMmAc/ft3b0HzsuI/f7I4uCEVH64LdYb5vB8S7gCHI9NKyCCT+lG6GHZMBt0qAwmq JnYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Snc6DwrRiD/cOxhQ9nOOo8DfqibULx1Ev/pz6Q2mgSA=; b=SGKZi+pJ5tHZJOk8ErmvU7N+doadtNDO3RDmX0x7RN9UgF5gQwSDr7MbslfPcQN1ZG fkp5AqPwWZKpn5kk0roPcHu+56iKxPg1BQ5hgyngTbxKoaMaWG4uJvPzO43A5fYaWyIC U5ps01yK3gzMXwc2CzrptAq2BhQGJ1vIyhNv6jzRGZNEYQ+QXarADL5JWSokLCK4TDmb j0Z10ZaMKQC7s/CwZN88UOVQBJ5X/T0/hmVyak0ao7qc3oQJg4PcjVt7Lxs6NVrbhdh8 8VX5GiD9f4h2W12EI8g6GGUAHjsDO8inLLZ03BiggUl4uifA35+pX5s++OY7NcV8sJ85 XujQ== X-Gm-Message-State: AOAM533rRUFjqKCowQjGHOzr7EcpPJek7/SAuq05Bln3yjw6HHZIlcZK nq3+vCiojKa8bA4RAhHcm1/DSTZJqqjZSdw+JTI= X-Google-Smtp-Source: ABdhPJzvJqWdfgKB+hfCCIYPvAk3x8xb+AdE6tztEwb/mMAofB/bKGwguvTB1rb36bRIDYH0aHlbvg== X-Received: by 2002:a1f:450a:: with SMTP id s10mr1342497vka.29.1638995340980; Wed, 08 Dec 2021 12:29:00 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id f11sm2467691vkk.50.2021.12.08.12.29.00 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Dec 2021 12:29:00 -0800 (PST) From: Philip McGrath Date: Wed, 8 Dec 2021 15:28:14 -0500 Message-Id: <20211208202838.752542-20-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211208202838.752542-1-philip@philipmcgrath.com> References: <46a042bc08eb72a068b1e8c69bfe28cf2d4b2e53.camel@gmail.com> <20211208202838.752542-1-philip@philipmcgrath.com> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * guix/build-system/node.scm (lower): Add the version of libuv used as an input to the #:node package as an additional implicit input, so that packages needing libuv always get the correct version. --- guix/build-system/node.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 4f437f9c0d..179da65ee8 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -1,6 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2021 Pierre Langlois +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,10 +61,15 @@ (define private-keywords `(("source" ,source)) '()) ,@inputs - ;; Keep the standard inputs of 'gnu-build-system'. ,@(standard-packages))) (build-inputs `(("node" ,node) + ;; Many packages with native addons need + ;; libuv headers. The libuv version must + ;; be exactly the same as for the node + ;; package we are adding implicitly, + ;; so we take care of adding libuv, too. + ("libuv" ,@(assoc-ref (package-inputs node) "libuv")) ,@native-inputs)) (outputs outputs) (build node-build)