From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IAv0MBhkzWEJzAAAgWs5BA (envelope-from ) for ; Thu, 30 Dec 2021 08:47:36 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id AFpULhhkzWGaZgEA9RJhRA (envelope-from ) for ; Thu, 30 Dec 2021 08:47:36 +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 aspmx2.migadu.com (Postfix) with ESMTPS id 8A5461EAC8 for ; Thu, 30 Dec 2021 08:47:36 +0100 (CET) Received: from localhost ([::1]:60424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n2q9v-0004IL-L1 for larch@yhetil.org; Thu, 30 Dec 2021 02:47:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2q9R-0004B9-A9 for guix-patches@gnu.org; Thu, 30 Dec 2021 02:47:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n2q9Q-0005sH-CX for guix-patches@gnu.org; Thu, 30 Dec 2021 02:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n2q9Q-0006uR-Bg for guix-patches@gnu.org; Thu, 30 Dec 2021 02:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v7 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:47:04 +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.164085040626437 (code B ref 51838); Thu, 30 Dec 2021 07:47:04 +0000 Received: (at 51838) by debbugs.gnu.org; 30 Dec 2021 07:46:46 +0000 Received: from localhost ([127.0.0.1]:51130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2q97-0006sE-Mr for submit@debbugs.gnu.org; Thu, 30 Dec 2021 02:46:46 -0500 Received: from mail-qt1-f180.google.com ([209.85.160.180]:33432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2q8B-0006oL-UR for 51838@debbugs.gnu.org; Thu, 30 Dec 2021 02:45:48 -0500 Received: by mail-qt1-f180.google.com with SMTP id v4so18427743qtk.0 for <51838@debbugs.gnu.org>; Wed, 29 Dec 2021 23:45:47 -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=kTheVaIDIGgy9Jg60jIJkyn44DBAzd5/p25DCOt7OsMDjmk1rES9/p2QOEtNm5Sgm7 pat6uv0JWUSkn1tDMP+1XskMkkN5wyGk3HMQQ6UcSzfi5Pm/1ZWAulIvfmxO4Jnkx1jC EwQkDnLgTIzq9j74xuR6lKow4sbpl+OgmMIvmMW46Bj4JIJiqTNEIG++2gLW0o/obM99 467bvLdvMch75RL8A6eQUxWlmDcyVOAsX1F6+eZvD4gh3WmPSGLEBW8ToeS+1qtvXW/5 V2tsUHW4PV/fsBIvJCDLWZW+Z6VoNEItdNaDYI3VdprqTlNR7MhyQFk6DhiERTegriho zQlA== 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=KE29Dh/Y13Vuno0SNR+YbWPDOowg+sUPhlwmLv64YDFnRFPhcIITYQEvsMUIByfnRX Z7bKWlETHPA0ZgBcFIjpi5JcIJ5pB2WfvltqdA5CeCk46A77ff4fA52yB6xsUYGN2krB ey2jh/8jRiyXtn2tsrep2qojM9S0Cjx7PuDjHTlFQOzHn5VlMn983jmdQKrOROCDTYtz Y4rJpJ32UGKmB0j8e4W9PLIpMg3huBcLpcMJVIu4VBZ94XgCVR9NUgtqkVNzvEr+Avnu e0BMGmMtTXNT8SvCQZ6xY1TMTV/WLviRdIa/ycI32/iMLXbNGjkMH9p74z9NSC2OdVXa 8LEA== X-Gm-Message-State: AOAM533PsaPRPx68rL/fgEtzLdm8jth0ZCwbOhHmztu9jSW1Wzr1/MIi 9mhzid2fyaB832elhoqDW6gsGlgqU3Dn7vb0 X-Google-Smtp-Source: ABdhPJzbUbBGctkgmOoDEXGnXyNjFou0TSZxUsxZE/UbZp9t8iXQ24pqVvZwb8j1hzGBRsHkITZYPw== X-Received: by 2002:a05:622a:58b:: with SMTP id c11mr25252287qtb.470.1640850341003; Wed, 29 Dec 2021 23:45:41 -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 r185sm17782601qke.134.2021.12.29.23.45.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Dec 2021 23:45:40 -0800 (PST) From: Philip McGrath Date: Thu, 30 Dec 2021 02:44:17 -0500 Message-Id: <20211230074456.33433-3-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230074456.33433-1-philip@philipmcgrath.com> References: <20211230073919.30327-1-philip@philipmcgrath.com> <20211230074456.33433-1-philip@philipmcgrath.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640850456; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=OR+Y4twRr3s8Rn/RIH2mP3iVUWWT56VgTF28n5YcXZs=; b=VdtsO8EotW0i1Cch9SPYaTuHyD8Jfm/1Z0sfNtBlKOkTMJNC7awx0YAwKzMn+sTiYRdqVl 8+wPcRtnCt4iLYKBGMqcCqJzikaN2aR6jM0wPv10KjvqAsCAZ5IWGGDPgYHd/1zcreE4ht LOf+b4S4F3uxiegmeW9FC25y7qUimtmIljaqaRC5GgggGgKOOiB3DX0U2LQs/sEPVNQ4ny ZlnoZzR8OD0U9IYsgFdfP7m2oJ5x0t/UsV8guoGINyc5WzaRPPYoCSynAaAACAKENhAR1m NQOolyz1oafr8iS6+QbhHTgtr4qhs2Yg3eGHupD3Ye+dPgPgQN+Veq+7mdSF+A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640850456; a=rsa-sha256; cv=none; b=PW2HKZ7iufU5DI25EDgGY1iz8HPLAnMJ/NfOektyrQLtcTxcKZohnWFc/4C/1rvq5N+ZWh PG6P0+4aDo+zp21WVaHrGk+5rmtCwxw33yMNsbC8GDdp5/OQ0Ta9/hlYrs0mZJ6mmKvQYF 03rx48gPj/zWWjN4iwGnsKNpOq2nxLaAVd5cNGx2vDCAiMEiNyL0zI6hL8MlBo2S+m5kbv knRbCAD3o/mXc27nz71XALbWsUlgMesuCATmzdAGZs1UDVeOGUTsUYDTSP/AefBexuHeWo ZOA/e/zANm1MFjeHlso0eD+LZqVqDxHum7qNFKbwKUWQpjpvxLreXuOn3RRPKQ== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=kTheVaID; dmarc=none; spf=pass (aspmx2.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" X-Migadu-Spam-Score: -0.57 Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=kTheVaID; dmarc=none; spf=pass (aspmx2.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" X-Migadu-Queue-Id: 8A5461EAC8 X-Spam-Score: -0.57 X-Migadu-Scanner: scn0.migadu.com X-TUID: mjGT5/d/1FNM * 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) -- 2.32.0