From patchwork Fri Jul 31 17:11:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Deslauriers, Douglas via Guix-patches\" via" X-Patchwork-Id: 23478 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 8830727BBE3; Fri, 31 Jul 2020 18:12:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0CC6D27BBE1 for ; Fri, 31 Jul 2020 18:12:08 +0100 (BST) Received: from localhost ([::1]:51434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1YZj-0003Ju-Io for patchwork@mira.cbaines.net; Fri, 31 Jul 2020 13:12:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1YZe-0003Jk-Dn for guix-patches@gnu.org; Fri, 31 Jul 2020 13:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55235) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k1YZe-0005xN-5Y for guix-patches@gnu.org; Fri, 31 Jul 2020 13:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k1YZe-0001Lj-18 for guix-patches@gnu.org; Fri, 31 Jul 2020 13:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42639] [PATCH] bump Node to 14.6 Resent-From: Formbi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Jul 2020 17:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42639 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42639@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.15962155085163 (code B ref -1); Fri, 31 Jul 2020 17:12:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jul 2020 17:11:48 +0000 Received: from localhost ([127.0.0.1]:38548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1YZP-0001LD-H0 for submit@debbugs.gnu.org; Fri, 31 Jul 2020 13:11:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:53902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1YZN-0001L4-BV for submit@debbugs.gnu.org; Fri, 31 Jul 2020 13:11:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1YZN-0003Ix-6p for guix-patches@gnu.org; Fri, 31 Jul 2020 13:11:45 -0400 Received: from mail-40130.protonmail.ch ([185.70.40.130]:50383) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1YZL-0005wh-3Y for guix-patches@gnu.org; Fri, 31 Jul 2020 13:11:44 -0400 Date: Fri, 31 Jul 2020 17:11:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1596215500; bh=eELlZTSOHH+rZqmoMSetKVi3CwQDMtl09Fp5bMJ2RVs=; h=Date:To:From:Reply-To:Subject:From; b=Do/aOXf6YB+HenKLrSYQSwL1p6PF6h/6ozMGHMpDMfhsFh3Lw3JbCqEpxD9Kd0pT3 ikfqV551Xa0WhyyHTlhMTCipNApf3EXweEyhmWtJ8gZ/tzuu79g5fqbW5xdkuv2o0J 3GsLv03tBty1MKRydJQqRZcTyimkuCgpT1vyImpU= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.130; envelope-from=formbi@protonmail.com; helo=mail-40130.protonmail.ch X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/31 13:11:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Reply-to: Formbi , Formbi via Guix-patches X-Patchwork-Original-From: Formbi via Guix-patches via From: "Deslauriers, Douglas via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches Empty Message From 0dc32f60b10c39f585d3535f3ff35e0e9812a6a0 Mon Sep 17 00:00:00 2001 From: Formbi Date: Fri, 31 Jul 2020 19:09:26 +0200 Subject: [PATCH 2/2] bump node to 14.6 --- gnu/packages/node.scm | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 1adb2cd07f..a7658e626a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -199,6 +199,60 @@ devices.") (properties '((max-silent-time . 7200) ;2h, needed on ARM (timeout . 21600))))) ;6h +(define-public node-14.6 + (package + (inherit node) + (version "14.6.0") + (source (origin + (method url-fetch) + (uri (string-append "https://nodejs.org/dist/v" version + "/node-v" version ".tar.xz")) + (sha256 + (base32 + "153a07ffrmvwbsc78wrc0xnwymmzrhva0kn6mgnfi3086v3h1wss")) + (modules '((guix build utils))) + (snippet + `(begin + ;; Remove bundled software. + (for-each delete-file-recursively + '("deps/cares" + "deps/icu-small" + "deps/openssl")) + (substitute* "Makefile" + ;; Remove references to bundled software. + (("deps/http_parser/http_parser.gyp") "") + (("deps/uv/include/\\*.h") "")) + #t)))) + (arguments + (substitute-keyword-arguments (package-arguments node) + ((#:configure-flags configure-flags) + ''("--shared-cares" + ;; "--shared-http-parser" + ;; node can't find the pkg-config file for http-parser + "--shared-libuv" + ;; "--shared-nghttp2" + ;; for some reason only the bundled nghttp2 works + "--shared-openssl" + "--shared-zlib" + ;; "--without-snapshot" + ;; this option is no longer available + "--with-intl=system-icu")) + ;; Almost all the tests require NPM and the one that doesn't does + ;; something stupid and fails on 14.6 + ((#:tests? _ #f) #f) + ;; The patch-files was preparing the tests, now it's not needed + ((#:phases phases) + `(modify-phases ,phases + (delete 'patch-files))))) + (inputs + `(("c-ares" ,c-ares) + ("http-parser" ,http-parser) + ("icu4c" ,icu4c-67) + ("libuv" ,libuv-1.38) + ("openssl" ,openssl) + ("zlib" ,zlib) + ("brotli" ,google-brotli))))) + (define-public libnode (package (inherit node) -- 2.26.0