From patchwork Mon Dec 13 06:00:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 35174 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 2F45327BBE9; Mon, 13 Dec 2021 06:05:44 +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 799D427BBEB for ; Mon, 13 Dec 2021 06:05:43 +0000 (GMT) Received: from localhost ([::1]:44204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mweT0-0004J8-JT for patchwork@mira.cbaines.net; Mon, 13 Dec 2021 01:05:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mweRU-0002U2-GG for guix-patches@gnu.org; Mon, 13 Dec 2021 01:04:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mweRT-0007Jj-6B for guix-patches@gnu.org; Mon, 13 Dec 2021 01:04:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mweRT-0002Xt-1n for guix-patches@gnu.org; Mon, 13 Dec 2021 01:04:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v4 20/45] guix: node-build-system: Add implicit libuv input. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Dec 2021 06:04:07 +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 Cc: Timothy Sample , Pierre Langlois , Jelle Licht , Philip McGrath , Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.16393754299646 (code B ref 51838); Mon, 13 Dec 2021 06:04:07 +0000 Received: (at 51838) by debbugs.gnu.org; 13 Dec 2021 06:03:49 +0000 Received: from localhost ([127.0.0.1]:53745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mweRB-0002VR-6B for submit@debbugs.gnu.org; Mon, 13 Dec 2021 01:03:49 -0500 Received: from mail-vk1-f175.google.com ([209.85.221.175]:33685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mweR8-0002V5-PZ for 51838@debbugs.gnu.org; Mon, 13 Dec 2021 01:03:47 -0500 Received: by mail-vk1-f175.google.com with SMTP id h1so9734281vkh.0 for <51838@debbugs.gnu.org>; Sun, 12 Dec 2021 22:03:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Snc6DwrRiD/cOxhQ9nOOo8DfqibULx1Ev/pz6Q2mgSA=; b=iRyQhP1GepTLjuoO2Vq6LxEQiKzZC/o9/TmXcY6/GrU23pYRWGhV/83n4NmM6HIhb8 eef8IgZASzX6mmxA97jnNh0K9XAMIsI/7eVQS+noibf4zN1nDkXoZPG5OGnpdXkkAOgz R06fG8Jk51oPTNgHur4b4LExn45M0MlHxppUPxIOKmP+08y4PtAw5mhaDFwSr730ZLUZ qIqaRkpZLKLEt4Gl/w8XOb9K3oH2Ula+OWSTB/Ga6FYtcPKHjgz/lOF8n0T1WuLpZaxV lM/S6bTiD1RC2rkuZES/P8zaaFs5ebIorzOTHsqdO8m9qxcvndWNeLT+NsVdq4Qoqd+R IUmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Snc6DwrRiD/cOxhQ9nOOo8DfqibULx1Ev/pz6Q2mgSA=; b=LNk2pWRjT4vwIwRvo9Jmd/rf352xxwkzvAJT4cNaIeTwK72tqVArYI211R9lI+pvPd t6jAIpwuhHXGPFsqlhyasVy7qzlk7VdQH69EIol3UhdSE5AGmqXYXO9n7Ih4nAbMyhJJ 39CoWkf49FJH2nF76Q+zGN6rI/9W6VnnE9TsWZ5pUnw2jPgjNXLbSIbrWT1fylrPcBTD gvFP87rXoFy8+7jKXXDObs2LqYRYBuS/NLI1Q7T2CNjcT/GiMvMSMR5yy0XERH7JhpoH Yizl3q3XGEv9ONway28iMFtsuF4zg8KhgfXSsbDpDi2gE8o5b60UVVO7hZmXxmLufAkb V+uA== X-Gm-Message-State: AOAM532r2VheF7gb9eANonInh7CuoB+oc7fddldkybSnMfSe6VXtoOe4 UOqEmO7zcvDUxUET9bdy1qIT6V5sB2FFiENYpv4= X-Google-Smtp-Source: ABdhPJzUcyZZzD2lJh/JgWLK+R36KKneYo7VwIan9IRIGpjW1Xir8PftNnDAfY1ACG50Wc52FXX8UA== X-Received: by 2002:a1f:e1c7:: with SMTP id y190mr29894328vkg.31.1639375421360; Sun, 12 Dec 2021 22:03:41 -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 o7sm3760116vkl.41.2021.12.12.22.03.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 12 Dec 2021 22:03:41 -0800 (PST) From: Philip McGrath Date: Mon, 13 Dec 2021 01:00:42 -0500 Message-Id: <20211213060107.129223-21-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211213060107.129223-1-philip@philipmcgrath.com> References: <46a042bc08eb72a068b1e8c69bfe28cf2d4b2e53.camel@gmail.com> <20211208202838.752542-1-philip@philipmcgrath.com> <20211208202838.752542-5-philip@philipmcgrath.com> <877dc924h7.fsf@gmx.com> <5c62c3ce-dd50-5dcd-00ed-ff1524be4e0b@philipmcgrath.com> <20211213060107.129223-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)