From patchwork Fri Dec 17 02:03:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 35319 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 B8C7C27BBEA; Fri, 17 Dec 2021 02:07:34 +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 6FDDF27BBE9 for ; Fri, 17 Dec 2021 02:07:34 +0000 (GMT) Received: from localhost ([::1]:54262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1my2eh-0005nu-Ol for patchwork@mira.cbaines.net; Thu, 16 Dec 2021 21:07:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1my2dJ-00049S-Cp for guix-patches@gnu.org; Thu, 16 Dec 2021 21:06:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1my2dJ-0007ym-3B for guix-patches@gnu.org; Thu, 16 Dec 2021 21:06:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1my2dI-0005C9-UZ for guix-patches@gnu.org; Thu, 16 Dec 2021 21:06:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v5 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: Fri, 17 Dec 2021 02:06: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.163970672919754 (code B ref 51838); Fri, 17 Dec 2021 02:06:04 +0000 Received: (at 51838) by debbugs.gnu.org; 17 Dec 2021 02:05:29 +0000 Received: from localhost ([127.0.0.1]:37328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1my2ci-00058O-KH for submit@debbugs.gnu.org; Thu, 16 Dec 2021 21:05:28 -0500 Received: from mail-qk1-f170.google.com ([209.85.222.170]:39797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1my2cU-00057O-Eu for 51838@debbugs.gnu.org; Thu, 16 Dec 2021 21:05:14 -0500 Received: by mail-qk1-f170.google.com with SMTP id b67so791403qkg.6 for <51838@debbugs.gnu.org>; Thu, 16 Dec 2021 18:05:14 -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=ctoqmjnDv0LqeaRDSObHFET0FHQH1emar7q4mgvxiic=; b=iS4shuf9gOxurnbNCvgwJBZc6d9u2ULG11VENEHc+FzJGEdl0bLQXiw2X0xB/s2v+J xnLFIrTTxSx7EDhBMetO3xFPy5GqLk5lAsZNJw59HqdUc3W48IX8BNzeoEpvBFk9dmqu TxpKjjdeYOCgJ4rFBIADja9Za6n+ZE3k5Ub//OVkrHiOEEwx//58CNhGsRtRR6BSiEfA 1o+mQGy2NK0XvdcsP8Dz1cIL8vI2fRGjAVu4CiThIiegbjs6OMhlHz8/ItdcZAAzKP22 pVs595ilXJKm7zA9t2wYmQOsw5+g+ohvj4nq+JtpzfskqduOm22AlQPtXU+qmKjq/MYR aDbg== 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=ctoqmjnDv0LqeaRDSObHFET0FHQH1emar7q4mgvxiic=; b=JOBNP6lU0Q3MKg2YAvrXPuJMTKlAD1D2Wy3Vt6O1h4TrF3RbyIeLs+bL7qoHtZwMMC Xecep4FNgjk5XNGvN1cHGizHBBZMjvOHNJos2SvQaUf7Emmezd2QNIfaJG5Yz5G6qHbl fiArTYm768LAA/C3hQCmmivVAYJ7OMoghiaWaTDcUGzr8PvhJM+NQPKTeyy4N4zgJiOY Tn3aIljgUsBcBigaYWBTOawFd7zdkQ0l/digHF7++eEthe0v9IuQ403H+lYdFvVfHfNj s03zZMejTUzf/h681uT0lcYDxXcXLf11+/1YnAVAgeMiPNHy9ur9QntVOB9JMf+BUNfL uLKw== X-Gm-Message-State: AOAM532aNoDxkHNvcJVylxRwnokzNaeG2u5Q6xnTObYx8z2lWtVyUXNj Bw9mXbU/kfGiVmcULU1wWhrEyJDRoYcFpYSejT8= X-Google-Smtp-Source: ABdhPJzj39wlZWI4djAsxL7NzADUyTfF1f+2k4Qi8eO2tji5W42ztcruSeySmlDc+bg+rc6wAxQX9Q== X-Received: by 2002:a05:620a:a8c:: with SMTP id v12mr540841qkg.73.1639706709018; Thu, 16 Dec 2021 18:05:09 -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 143sm3936716qkg.87.2021.12.16.18.05.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Dec 2021 18:05:08 -0800 (PST) From: Philip McGrath Date: Thu, 16 Dec 2021 21:03:00 -0500 Message-Id: <20211217020325.520821-21-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211217020325.520821-1-philip@philipmcgrath.com> References: <20211213060107.129223-1-philip@philipmcgrath.com> <20211217020325.520821-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 330d10dca5..47af4bb9e2 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. ;;; @@ -62,10 +64,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)