From patchwork Sat Jan 8 08:41:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 36123 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 B374327BBEA; Sat, 8 Jan 2022 08:48:24 +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 7D60527BBE9 for ; Sat, 8 Jan 2022 08:48:24 +0000 (GMT) Received: from localhost ([::1]:45260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n67Oh-0006O0-LP for patchwork@mira.cbaines.net; Sat, 08 Jan 2022 03:48:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n67KV-00028c-Fl for guix-patches@gnu.org; Sat, 08 Jan 2022 03:44:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n67KV-00046u-6t for guix-patches@gnu.org; Sat, 08 Jan 2022 03:44:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n67KV-0000j0-5q for guix-patches@gnu.org; Sat, 08 Jan 2022 03:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v9 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: Sat, 08 Jan 2022 08:44:03 +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 , Philip McGrath , Pierre Langlois , Liliana Marie Prikler , Leo Famulari , Jelle Licht Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.16416314402756 (code B ref 51838); Sat, 08 Jan 2022 08:44:03 +0000 Received: (at 51838) by debbugs.gnu.org; 8 Jan 2022 08:44:00 +0000 Received: from localhost ([127.0.0.1]:46288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n67KP-0000iK-Dh for submit@debbugs.gnu.org; Sat, 08 Jan 2022 03:44:00 -0500 Received: from mail-qv1-f45.google.com ([209.85.219.45]:33503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n67KN-0000i5-4j for 51838@debbugs.gnu.org; Sat, 08 Jan 2022 03:43:55 -0500 Received: by mail-qv1-f45.google.com with SMTP id kk22so7987040qvb.0 for <51838@debbugs.gnu.org>; Sat, 08 Jan 2022 00:43:55 -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=La9i8e5H4RSxR1EIClD2ei+BDLKH9tq/pZgwu7LOU6QwNHyNlkIwr0Q0e2a3sR7aCU Lwk9zYHRMa7l+JUI3XHoi09uzQgsRQADPpt4mi4ztYgBimVLqye2OXV2ESTt8ImBxTmN CUHIVPLYIzBRYtY+IozpKpepFUwuHI9PEN7UIbkseefjjeyN8+XOtuisNgSWCBAOApku HdUGeibeGwR50RJHd1viIr+/1rEw//yH3QE//7brSb5+DBgAUBat4vmPBpBCNvwTXYds 5mdIGUk80Z4e/uTQwfRF6d31loXmUckr9fL7asOo8jcDE0AbHEnh4QC0y1UG+k2Moks/ CmAg== 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=PbPyjkYVMYpt3+6TwgTZKEDTOC2BVE5zFolIXfjS8rv0NoKffXgoJELVkehSkwJuOB zGpQKCFz+lcZPJcI+L+sMFqplfcpb+u3kBUUmNeXhH7ylLrWwyTP69zNOLV2SisG9Zue oACBeFe/5FXqjYrgfRODuaXd/q0PA5+F1rHnA5VnUM6D7gDSqMn2FE28DRRDdeUwc7K0 iMiTRJA3/hoPKUGttNl7MUr4pfl2aMlXW4dZfiQCv7I3ITzjgfpykxpQJyl2w9kFlqxw 6lN6eq2YfE9nUM2ZH8PvS/JYNLB5X0zxJwHytwb9wj6Ujdd50/M3+zQFokD7ehM8bbVF z6/Q== X-Gm-Message-State: AOAM530EWdHCk5BrQI9BrVPk5RqJtcuTsMoSwGM0ZEd25T1uLzTrRIYW 5QUH5fXrTr7cvvyTPciR67M+8cFXo0kLTRKW X-Google-Smtp-Source: ABdhPJx38z2Y0S5I1v3LBbI6CvKSrrkFD3AN4TmJZpgujKgiFog+7twC+b3vxGPCz5NDvE3kB8Nv1A== X-Received: by 2002:ad4:5de9:: with SMTP id jn9mr60729035qvb.78.1641631429649; Sat, 08 Jan 2022 00:43:49 -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 bi8sm688394qkb.22.2022.01.08.00.43.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 08 Jan 2022 00:43:49 -0800 (PST) From: Philip McGrath Date: Sat, 8 Jan 2022 03:41:50 -0500 Message-Id: <20220108084229.362642-3-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220108084229.362642-1-philip@philipmcgrath.com> References: <64e08d3a1838ed8507f33fae895545372960522f.camel@gmail.com> <7b04af28bbd57c67093ce8f33a648efec89693bd.camel@gmail.com> <441bfeb0-eb6e-81f6-488b-cdf1b09a78ef@philipmcgrath.com> <20220108084229.362642-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)