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: Liliana Marie Prikler X-Patchwork-Id: 36011 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 9F55B27BBEA; Thu, 6 Jan 2022 18:26:07 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=no 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 6F29F27BBE9 for ; Thu, 6 Jan 2022 18:26:07 +0000 (GMT) Received: from localhost ([::1]:41098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5XSg-0006uZ-JI for patchwork@mira.cbaines.net; Thu, 06 Jan 2022 13:26:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5XRg-0006K3-R4 for guix-patches@gnu.org; Thu, 06 Jan 2022 13:25:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49296) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5XRg-0000h0-Hf for guix-patches@gnu.org; Thu, 06 Jan 2022 13:25:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5XRg-0004y6-B3 for guix-patches@gnu.org; Thu, 06 Jan 2022 13:25:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v8 02/41] guix: node-build-system: Add implicit libuv input. References: <20211114124151.36743-1-philip@philipmcgrath.com> In-Reply-To: <20211114124151.36743-1-philip@philipmcgrath.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Jan 2022 18:25: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: Philip McGrath Cc: 51838@debbugs.gnu.org, Timothy Sample , Pierre Langlois , Jelle Licht , Leo Famulari Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.164149347518850 (code B ref 51838); Thu, 06 Jan 2022 18:25:04 +0000 Received: (at 51838) by debbugs.gnu.org; 6 Jan 2022 18:24:35 +0000 Received: from localhost ([127.0.0.1]:42162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5XRC-0004tk-1A for submit@debbugs.gnu.org; Thu, 06 Jan 2022 13:24:34 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5XR1-0004rZ-Tb for 51838@debbugs.gnu.org; Thu, 06 Jan 2022 13:24:25 -0500 Received: by mail-wm1-f67.google.com with SMTP id p1-20020a1c7401000000b00345c2d068bdso4125541wmc.3 for <51838@debbugs.gnu.org>; Thu, 06 Jan 2022 10:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=cM4/KoYsFd7gxgnf3lEVFx9/uOaGbMT8ZMtEssH8QbE=; b=GKV2F/J/GVdfUxxyNKkamBQaCMy8A7fki+Ke0yzjoxTlxl0MmhtMAbIHMJhL9neXRs CQSIUMu/OwSo4Y4mnNy6ZwvJLhGnZA4C4ZT+BpNOEq3EaVJfIrP0Y6jgQ+9HIST0D1Zl 0UofcE3fqV2+4Uit/EAEpq24TYWlEkS6Avl6wwL4kQgkce/6+XKQISppt6JBcreQGDn5 Y3lyfjDU2MrBtkHAyFCI+5KdTDFx6s11QkjgypUXUGkUuvQxHlEsYbJ+rIemwetGUwDJ ff1XoaCmCIQj5B/9wMGXePnfBln1W73r3FVT+yKtQhhbmf47GwgEvsKGeT0wnuZesqkg YCkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=cM4/KoYsFd7gxgnf3lEVFx9/uOaGbMT8ZMtEssH8QbE=; b=lm/5aXb2k4Qc0EUSXvAfN9eaDVKaWsHKGoTGIq89qEGWJVg4cXKCv5Dm1LrkxZl1Rl pCVdtG3LVP8AsfOgSGOstu/OBTchV1HrQHXB8A2NRch1vo6Vp0yWweVHj/KXrfkX5chI XaZZ5SxZt6V57un3MULvAVhOFiIcW57BDHAYaon+8UQlJ1Cq5iX/lpaMoCSwX1GQ1ZrC ekS6iNbodcW5LSaZ6ctCPHDo5WTIlnAWNlBNzJH6kSjqauZwqQcbWuv12Lij4wMhAorQ L38L5f4MNO4Fn4lLCGwPu7mF7b4IJGT3FzcXe+fffNvtmMAiEwxS1DFRgqJxvlaGLb8q u9Ng== X-Gm-Message-State: AOAM533BLj7NbYQ75zu9FwOfqPLqcknjPpCoQtyFBVuRAhy3kfpV3JJi SRc6yj0rcDJnFeJbX4Mmpe4= X-Google-Smtp-Source: ABdhPJzkJAAA7NRU2FsJCxpstRb+FE4nSWNcq4NHa8oZREtJDY6KzWgPjpILPsCMvaAFvmcVeGoJEg== X-Received: by 2002:a7b:c745:: with SMTP id w5mr7835564wmk.167.1641493458334; Thu, 06 Jan 2022 10:24:18 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b17sm2693311wrq.91.2022.01.06.10.24.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jan 2022 10:24:18 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 30 Dec 2021 02:38:40 -0500 Message-ID: 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. Signed-off-by: Liliana Marie Prikler --- 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)