From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id oAWWCvloJ2dMdgAAqHPOHw:P1 (envelope-from ) for ; Sun, 03 Nov 2024 12:13:45 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id oAWWCvloJ2dMdgAAqHPOHw (envelope-from ) for ; Sun, 03 Nov 2024 13:13:45 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Z3uNZtcF; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021081301 header.b=Umav6UpS; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fsfe.org (policy=none); spf=pass (aspmx1.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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730636025; a=rsa-sha256; cv=none; b=PdQWQvy8nD2hqgkCdkIo6av5Ee6PTiYVb37SOU/ZizP6VCtl0TpKBVaqJXI7nj9Jhfoi8F LMvhBEtvOpI0LzIErNGnbaxSz/+h0iUUt4XaoWbzYdqPrEGQpfeBsQno8sL0dKMlIrdh5+ uWI4NouVZevtvJLfhZjakvLeRfTXX9vMc03bHwtVZOmGjMksh0aZQdzb0nIu/fQqKbnOsq OngpgkN4ZYUJLHAH6nHh/jpULsBDUNU+gBjV1YxVcVU2FOMhn9pzWlEPb9Ql9cGezTU94+ u5NXmC75av9qK1LrKZuO6Lb4ngPticn231n6LME/DKpZaunusGtfJV6PrKeMqQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Z3uNZtcF; dkim=fail ("headers rsa verify failed") header.d=fsfe.org header.s=2021081301 header.b=Umav6UpS; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fsfe.org (policy=none); spf=pass (aspmx1.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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730636025; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=gST/3Fx13K9qLQFHxKNtt4nFeOD7CDeVCUV+5BTqzQw=; b=RDnNlUZmbIZXzB+Sh4jwdqx2vhRAK1iPpSIufRvZdO0zSQBmibR/dnLq9HaJecnAOIviZV bneK1etM8GHMfFT+IHUeKs7g8z5s8M8ZZKStO6IB+mVTE3IMvE5tUWa+vOjeiB39BdS1Dw UB4y0U6h5HwxlCoa0JS3kHklftl2BD59BXP7a3Jq0Rov3stAKTz09SXBa+iDwoH7M2SMUt lVl7Z60efoLbD4gBeWGJNc9znoJ7Y6VSsCrW5DTO6WihrUcpOnIieyI4xTa+1jnQhjmGat XXgiaw+H0UyUhyDJ0B1DesHBXL95qaJ9aY20ct7FWGH9uwnpjAmmkn/H6twUTw== 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 aspmx1.migadu.com (Postfix) with ESMTPS id 05DE9198DC for ; Sun, 03 Nov 2024 13:13:45 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7ZTd-0000pu-Cd; Sun, 03 Nov 2024 07:13:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t7ZTb-0000pF-4z for guix-patches@gnu.org; Sun, 03 Nov 2024 07:13:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t7ZTa-0005Qr-St for guix-patches@gnu.org; Sun, 03 Nov 2024 07:13:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=gST/3Fx13K9qLQFHxKNtt4nFeOD7CDeVCUV+5BTqzQw=; b=Z3uNZtcFn3WX0CwrCM7whVS17koq3o6zz4KAC02C9P3gpVSOT0fbx4BPSNjjqRM1tpgG9Cl5jmuCCtp/TPKEBKFZJkBsVu/AqJdHGeXQYgJJ/q3mWdvyC8JbESTj/dwugXnLeJPDLGX/N8bUesnDz+KjwKyHoJzyuxXgr/ecb5souy456uPWYHCq7VYe5yiXK7lJs7R7uaBtit+H/eLTJf0BgXEeXE+f5zmsgRSFsaeskSZKc2cWPajROECbU7tEig564tI45D/aPv4xu7ojlI00qVL954m0U+96cFNtqYmXrnAG+HRCNNa/etOeigbJdgDSufHKiAwbXkN8eimGDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t7ZTa-0004hq-LS for guix-patches@gnu.org; Sun, 03 Nov 2024 07:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74187] [PATCH 20/20] gnu: node: Rename variable node-bootstrap and hide package. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Nov 2024 12:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74187 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74187@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 74187-submit@debbugs.gnu.org id=B74187.173063592818032 (code B ref 74187); Sun, 03 Nov 2024 12:13:02 +0000 Received: (at 74187) by debbugs.gnu.org; 3 Nov 2024 12:12:08 +0000 Received: from localhost ([127.0.0.1]:60034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7ZSh-0004gl-BA for submit@debbugs.gnu.org; Sun, 03 Nov 2024 07:12:07 -0500 Received: from mail2.fsfe.org ([213.95.165.55]:37764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7ZKi-0004IA-UH for 74187@debbugs.gnu.org; Sun, 03 Nov 2024 07:03:53 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021081301; t=1730635432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gST/3Fx13K9qLQFHxKNtt4nFeOD7CDeVCUV+5BTqzQw=; b=Umav6UpSsrM9/5LATrbDZTc0LDYL4+M+QaJ9b9fXyMVNVsgUuEtgLMO7ND2yBnpKlXmrkd dLRv4OW1qrkI3Z7FBccttOM74OeXyfYQrdb7UFTbtOz3hQMBuX/6TTpkpipr9zrTUOvclQ 1rHuqQEzLn7tUIlNS9Jkln1zcBPFumQ= Date: Sun, 3 Nov 2024 13:04:07 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.98 X-Spam-Score: 0.98 X-Migadu-Queue-Id: 05DE9198DC X-Migadu-Scanner: mx10.migadu.com X-TUID: sEVVHNru2z7k From: Jelle Licht The formerly known as node package has security issues, so should only be used to bootstrap more recent and secure versions of node. * gnu/packages/node.scm (node): Rename to... (node-bootstrap): ... this, and make it a hidden package. Change-Id: I536a8f55faa14f8221915467c2981053f4c4d70e --- gnu/packages/node.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index f046f1bad5..bf7fbebf8f 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -56,9 +56,12 @@ (define-module (gnu packages node) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (ice-9 match) + #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) -(define-public node +;; This should be the latest version of node that still builds without +;; depending on llhttp. +(define-public node-bootstrap (package (name "node") (version "10.24.1") @@ -338,12 +341,8 @@ (define-public node (license license:expat) (properties '((max-silent-time . 7200) ;2h, needed on ARM (timeout . 21600) ;6h - (cpe-name . "node.js"))))) - -;; This should be the latest version of node that still builds without -;; depending on llhttp. -(define-public node-bootstrap - (hidden-package node)) + (cpe-name . "node.js") + (hidden? . #t))))) ;; Duplicate of node-semver (define-public node-semver-bootstrap @@ -749,7 +748,7 @@ (define-public llhttp-bootstrap (define-public node-lts (package - (inherit node) + (inherit node-bootstrap) (version "20.18.0") (source (origin (method url-fetch) @@ -780,7 +779,7 @@ (define-public node-lts (("deps/uv/uv.gyp") "") (("deps/zlib/zlib.gyp") "")))))) (arguments - (substitute-keyword-arguments (package-arguments node) + (substitute-keyword-arguments (package-arguments node-bootstrap) ((#:configure-flags configure-flags) ''("--shared-cares" "--shared-libuv" @@ -976,7 +975,8 @@ (define-public node-lts nghttp3 `(,nghttp2 "lib") openssl - zlib)))) + zlib)) + (properties (alist-delete 'hidden? (package-properties node-bootstrap))))) (define-public libnode (package/inherit node-lts -- 2.46.0