From patchwork Thu Dec 30 07:38:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 35762 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 D6BB027BBE9; Thu, 30 Dec 2021 07:41:54 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 9747527BBE9 for ; Thu, 30 Dec 2021 07:41:54 +0000 (GMT) Received: from localhost ([::1]:52450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n2q4L-0006qo-4V for patchwork@mira.cbaines.net; Thu, 30 Dec 2021 02:41:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2q3c-0006qM-Hy for guix-patches@gnu.org; Thu, 30 Dec 2021 02:41:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n2q3a-0007sU-Pg for guix-patches@gnu.org; Thu, 30 Dec 2021 02:41:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n2q3a-0006Te-PI for guix-patches@gnu.org; Thu, 30 Dec 2021 02:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v6 02/41] guix: node-build-system: Add implicit libuv input. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Dec 2021 07:41:02 +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.164085005824860 (code B ref 51838); Thu, 30 Dec 2021 07:41:02 +0000 Received: (at 51838) by debbugs.gnu.org; 30 Dec 2021 07:40:58 +0000 Received: from localhost ([127.0.0.1]:50950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2q3T-0006Sh-69 for submit@debbugs.gnu.org; Thu, 30 Dec 2021 02:40:58 -0500 Received: from mail-ua1-f45.google.com ([209.85.222.45]:47077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2q3Q-0006SH-77 for 51838@debbugs.gnu.org; Thu, 30 Dec 2021 02:40:52 -0500 Received: by mail-ua1-f45.google.com with SMTP id c36so15677372uae.13 for <51838@debbugs.gnu.org>; Wed, 29 Dec 2021 23:40:52 -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=OR+Y4twRr3s8Rn/RIH2mP3iVUWWT56VgTF28n5YcXZs=; b=FNtlZIpgigZn+56BBWRpd5WMUhWzhdlHzQwtAgE2RLYtUfDnl7wgbL5+BgxEaKsIkJ 4/4U3kRcCKi4hABb2j239PJ2MS3/nq3/O/0Ugg1bSniO6uHVP3DqbqTUZ1nKQLGhzxyL zj2eo+IVTp2Y09rU3g6CwCMRWjMtLAwBfOs91kg+6ngLOrRmqgzO2mt7BZU4rBsyUBAj nIQ/VEfoKwjsoqtj+agg6yHhoB6lwoHEBaRLP38CEQoixwwgpffQpiIpupze34ADv0y6 63eXL25JEulozWBNDuMUdI9KltGeVYH2t21Hk/a1HzBVwiS4P2n5pTem+k845tJbeFYS W17A== 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=OR+Y4twRr3s8Rn/RIH2mP3iVUWWT56VgTF28n5YcXZs=; b=OV0+eetiw4d7dXDfPGZRvJkU93krc+H2GpOyNeJmWaaaluNdLnC726+a39N+Wg3hnr 3qXGzp6HYvjNkdZWQJ24KQSl4FzfLRzTN2AmaIJcLH/i+yWE9cM8xPDkwT+HYUXvt2dt JXPlZDb7svNeDJR+uO3Ywr8j5QBqDu3+NsLYKP4XcNJJMfCzmy6/dAEdbzKkpalrVprI GS8wnzmisMj7/ooTsSCjZYtf/cxoYJSzQouZJ2XwIzRT00Z+G6AL4NDf7cpNbpQAgRAz je41IxlvdoqO2NdAqX+S6OssW0bmjnignCeqYOQ9xlTX6/JeQXVv8YJ2XnM6lJfPZZNB Mt9A== X-Gm-Message-State: AOAM531Wj7q9skinX/jCpDiOQZ64oraq4bX2KoT6F88WU/ood1gJkyUt OE7rlbNDjuRu4KYGuPEjNXVkp7YaEnp6EO/q X-Google-Smtp-Source: ABdhPJw1hNhHJEYPVCtb0Mfp9nRvKeRN2RZqe6ac0cCZbDaaqcrqJdJ2CZt913/DiUXC6KsaO8ePpA== X-Received: by 2002:a67:e010:: with SMTP id c16mr8955066vsl.12.1640850046698; Wed, 29 Dec 2021 23:40:46 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with UTF8SMTPSA id 126sm4601941vku.25.2021.12.29.23.40.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Dec 2021 23:40:46 -0800 (PST) From: Philip McGrath Date: Thu, 30 Dec 2021 02:38:40 -0500 Message-Id: <20211230073919.30327-3-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230073919.30327-1-philip@philipmcgrath.com> References: <082a81964a43ae5f735ad2ca433d0dfe00859c35.camel@gmail.com> <20211230073919.30327-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 735f8dd06e..24bd677bfc 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -2,6 +2,8 @@ ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2019 Timothy Sample ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2021 Pierre Langlois +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,10 +63,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)