From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wDRuFcEm7WBRcgEAgWs5BA (envelope-from ) for ; Tue, 13 Jul 2021 07:38:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8I83EcEm7WBPYwAAB5/wlQ (envelope-from ) for ; Tue, 13 Jul 2021 05:38:09 +0000 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 525D91E89B for ; Tue, 13 Jul 2021 07:38:08 +0200 (CEST) Received: from localhost ([::1]:51156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3B7P-0006iQ-CT for larch@yhetil.org; Tue, 13 Jul 2021 01:38:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3B7K-0006i1-KQ for guix-patches@gnu.org; Tue, 13 Jul 2021 01:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3B7K-0005s5-Bv for guix-patches@gnu.org; Tue, 13 Jul 2021 01:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3B7K-0005f2-AE for guix-patches@gnu.org; Tue, 13 Jul 2021 01:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49242] Update UglifyJs (& dependencies) and update dependents Resent-From: Charles Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Jul 2021 05:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49242 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Efraim Flashner Cc: 49242@debbugs.gnu.org Received: via spool by 49242-submit@debbugs.gnu.org id=B49242.162615463321705 (code B ref 49242); Tue, 13 Jul 2021 05:38:02 +0000 Received: (at 49242) by debbugs.gnu.org; 13 Jul 2021 05:37:13 +0000 Received: from localhost ([127.0.0.1]:39187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3B6Q-0005dv-HI for submit@debbugs.gnu.org; Tue, 13 Jul 2021 01:37:13 -0400 Received: from mail-4325.protonmail.ch ([185.70.43.25]:25997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3B6N-0005dP-2H for 49242@debbugs.gnu.org; Tue, 13 Jul 2021 01:37:05 -0400 Date: Tue, 13 Jul 2021 05:36:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1626154615; bh=XurzXuOAqH6HXTOxZ+x7I0JLc4IlBL6FE0bEmmYWwlA=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=GTj0xC8T6O05SvCyZr7dFtDOfjW2TKehbvb5dOmLScUqoPB4cIeuTi68RamoulDME YffpecmheiiBZWTWO3/1u/BaWDcXUG0Wq6gy0lQqwDLM7HDlh0otaNtz3gfN/LNPcA yfPkBoXN2yFEq7GlkRKFhA6sm6uC+HZWwC6KH4dw= Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_roenYISMFTdqn0VQHNOvw9juMiHE0fqB5lU0T1J1leM" 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" Reply-to: Charles X-ACL-Warn: , Charles via Guix-patches From: Charles via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626154688; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=XurzXuOAqH6HXTOxZ+x7I0JLc4IlBL6FE0bEmmYWwlA=; b=PSdYt77e8FjLoqraqdyF6jd8OMxkQZLT3l/2Ahz/ZbDR2WhmFGjtuo1hrDYks9x3cMO2wX IcWvjYSsKuQpkkpnSFJp0x6H/YpVUf0EP0pSwpeQDY3MYUTc8BzRxp2FvHaYc36HHAh9QQ jr3ApKcSWdfl7oC8alBFhIktgr3y251Vj59oUW3+B4mPx11n/g3X0VV5mGiH3A/ly64hCf aWLMgXOPCuAv1fMZmrs2+edsyLUyHoS6KTEXPsOhlavnTSAqkaftRhXNwmO7mDXmJaC391 zP6hIh3+/f6covNpD4XVJJ3pXRQ6Pz4XY+Xpnrh9Rrm3B57ZXYris8gztTJRgQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626154688; a=rsa-sha256; cv=none; b=Jl91qVTIWYmW9IB5taQZhyANvUUr9M42/OXgiHd4u3vDoh+PJ4OjCD7qHFqKXSNj+Z2hIo +waRB15qS07l5aEjuYAn1ubzlu2p8hnHbHhw7UWWMl+2JWwJ/2de/c7yPKkNAuciL4vz2L /ylnWmOrZKLrXgU2Mp9zTrC48EfljidBy53Mdvnwzair2wNGmg3wWwYjksTFqEEr9LUM1+ A+HShKMu9fWXd5eswZRy8sRUvpn8X0g3Zj6b8T3BdAwBMkfj/vIhDExbg7fq6cBdGPjp1B pqlXROWXOEb1thGZ5PuLS2nKrecT6YqvSDp8Y/WlR8d+OIVoIGNSPxwTofRTxg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=GTj0xC8T; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.80 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=GTj0xC8T; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 525D91E89B X-Spam-Score: -1.80 X-Migadu-Scanner: scn0.migadu.com X-TUID: NOFCwJ4OMLQs This is a multi-part message in MIME format. --b1_roenYISMFTdqn0VQHNOvw9juMiHE0fqB5lU0T1J1leM Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Here it is redone. This time, I didn't touch the Common Lisp or R uglify bu= siness and just made a new one. The R people are welcome to update their pa= ckages to use the up to date their UglifyJs. I took your advice and put a p= ublic uglifyjs variable in uglifyjs.scm. That way when UglifyJs is rewritte= n in Rust, the same (gnu packages uglifyjs) module can be used. =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 Original Me= ssage =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 On Monday, July 12th, 2021 at 7:52 AM, Efraim Flashner wrote: > This should be two patches, one to add node-uglify-js and one to switch > > over to the new version. Other comments inline. > > I'm torn on putting uglify-js in a separate package module. I'm not > > entirely sure how deprecating packages works across modules, but I guess > > that's what I suggested below. > > It'd probably be best to put it in an uglifyjs.scm and rename the > > package to uglifyjs instead of node-uglify-js. > > On Sun, Jun 27, 2021 at 04:01:21PM +0000, Charles via Guix-patches via wr= ote: > > > From 53b96b21be2946e84e9687096313557a83c2e103 Mon Sep 17 00:00:00 2001 > > > > From: Charles charles.b.jackson@protonmail.com > > > > Date: Sat, 26 Jun 2021 14:44:23 -0500 > > > > Subject: [PATCH] gnu: Update UglifyJs. > > > > This change is to update the UglifyJs library. This updated Javascript > > > > implementation is by the same author as the original Common Lisp versio= n and > > > > is the official successor. It supports many commonly found features of > > > > ECMAscript 6. > > > > - gnu/packages/lisp-xyz.scm (uglify-js): Remove variable. > > - gnu/packages/node-xyz.scm (node-uglify-js): Add new variable. > > - guix/build-system/minify.scm (default-uglify-js): Update module-ref= . > > - gnu/packages/bioinformatics.scm (bismark): Update inputs. > > - gnu/packages/ci.scm (laminar): Update inputs. > > - gnu/packages/cran.scm (r-shiny): Update inputs. > > - gnu/packages/cran.scm (r-shinytree): Update inputs. > > - gnu/packages/cran.scm (r-colourpicker): Update inputs. > > - gnu/packages/cran.scm (r-threejs): Update inputs. > > - gnu/packages/cran.scm (r-flexdashboard): Update inputs. > > - gnu/packages/cran.scm (r-bios2cor): Update inputs. > > - gnu/packages/cran.scm (r-rintrojs): Update inputs. > > - gnu/packages/cran.scm (r-dygraphs): Update inputs. > > - gnu/packages/javascript.scm (js-mathjax): Update inputs. > > - gnu/packages/web.scm (hpcguix-web): Update inputs. > > > > gnu/packages/bioinformatics.scm | 6 ++-- > > > > gnu/packages/ci.scm | 6 ++-- > > > > gnu/packages/cran.scm | 36 ++++++++++----------- > > > > gnu/packages/javascript.scm | 6 ++-- > > > > gnu/packages/lisp-xyz.scm | 52 ------------------------------ > > > > gnu/packages/node-xyz.scm | 24 ++++++++++++++ > > > > gnu/packages/web.scm | 4 +-- > > > > guix/build-system/minify.scm | 4 +-- > > > > guix/build/minify-build-system.scm | 2 +- > > > > 9 files changed, 56 insertions(+), 84 deletions(-) > > > > diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformat= ics.scm > > > > index 7a1c8cc8e3..d11159b88c 100644 > > > > --- a/gnu/packages/bioinformatics.scm > > > > +++ b/gnu/packages/bioinformatics.scm > > > > @@ -105,7 +105,6 @@ > > > > #:use-module (gnu packages java-compression) > > > > #:use-module (gnu packages jemalloc) > > > > #:use-module (gnu packages linux) > > > > - #:use-module (gnu packages lisp-xyz) > > > > #:use-module (gnu packages logging) > > > > #:use-module (gnu packages lsof) > > > > #:use-module (gnu packages machine-learning) > > > > @@ -114,6 +113,7 @@ > > > > #:use-module (gnu packages mpi) > > > > #:use-module (gnu packages ncurses) > > > > #:use-module (gnu packages node) > > > > - #:use-module (gnu packages node-xyz) > > > > #:use-module (gnu packages ocaml) > > > > #:use-module (gnu packages pcre) > > > > #:use-module (gnu packages parallel) > > > > @@ -9245,7 +9245,7 @@ Browser.") > > > > (lambda* (#:key inputs #:allow-other-keys) > > > > (let* ((file (assoc-ref inputs "plotly.js")) > > > > (installed "plotly/plotly.js")) > > > > - (let ((minified (open-pipe* OPEN_READ "uglify-js" fil= e))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ "uglifyjs" file= ))) > > (call-with-output-file installed > > (cut dump-port minified <>)))) > > #t)) > > > > > > > > @@ -9303,7 +9303,7 @@ Browser.") > > > > "v1.39.4/dist/plotly.js")) > > > > (sha256 > > > > (base32 "138mwsr4nf5qif4mrxx286mpnagxd1xwl6k8aidrjgknaqg88zyr")))) > > > > - ("uglify-js" ,uglify-js))) > > > > > > > > - ("node-uglify-js" ,node-uglify-js))) > > > > > > (home-page "https://www.bioinformatics.babraham.ac.uk/projects/bism= ark/") > > > > (synopsis "Map bisulfite treated sequence reads and analyze methyla= tion") > > > > (description "Bismark is a program to map bisulfite treated sequenc= ing > > > > diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm > > > > index 0bcde0fad5..9f9f5d6c20 100644 > > > > --- a/gnu/packages/ci.scm > > > > +++ b/gnu/packages/ci.scm > > > > @@ -38,7 +38,7 @@ > > > > #:use-module (gnu packages guile) > > > > #:use-module (gnu packages guile-xyz) > > > > #:use-module (gnu packages gnupg) > > > > - #:use-module (gnu packages lisp-xyz) > > > > - #:use-module (gnu packages node-xyz) > > > > #:use-module (gnu packages mail) > > > > #:use-module (gnu packages package-management) > > > > #:use-module (gnu packages perl) > > > > @@ -252,7 +252,7 @@ intended as a replacement for Hydra.") > > > > (let* ((file > > > > (assoc-ref inputs (string-append name ".js"))) > > > > (port > > > > - (open-pipe* OPEN_READ "uglify-js" f= ile)) > > > > > > > > - (open-pipe* OPEN_READ "uglifyjs" fi= le)) > > (destination > > (string-append > > "../build/js/" name ".min.js"))) > > > > > > > > @@ -282,7 +282,7 @@ intended as a replacement for Hydra.") > > > > ("zlib" ,zlib))) > > > > (native-inputs > > > > `(("googletest" ,googletest) > > > > - ("uglify-js" ,uglify-js) > > > > > > > > - ("node-uglify-js" ,node-uglify-js) > > > > ("vue.js" > > ,(origin (method url-fetch) > > > > > > > > diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm > > > > index e01b2417d2..69d98d34aa 100644 > > > > --- a/gnu/packages/cran.scm > > > > +++ b/gnu/packages/cran.scm > > > > @@ -83,13 +83,13 @@ > > > > #:use-module (gnu packages java) > > > > #:use-module (gnu packages javascript) > > > > #:use-module (gnu packages libevent) > > > > - #:use-module (gnu packages lisp-xyz) > > > > #:use-module (gnu packages machine-learning) > > > > #:use-module (gnu packages maths) > > > > #:use-module (gnu packages mpi) > > > > #:use-module (gnu packages multiprecision) > > > > #:use-module (gnu packages networking) > > > > #:use-module (gnu packages node) > > > > - #:use-module (gnu packages node-xyz) > > > > #:use-module (gnu packages pcre) > > > > #:use-module (gnu packages pdf) > > > > #:use-module (gnu packages perl) > > > > @@ -1991,7 +1991,7 @@ previewing themes in real time.") > > > > ("js-strftime" ,js-strftime) > > > > ("js-highlight" ,js-highlight))) > > > > (native-inputs > > > > - `(("uglify-js" ,uglify-js) > > > > > > > > - `(("node-uglify-js" ,node-uglify-js) > > ("gfortran" ,gfortran) > > ("js-bootstrap-accessibility" > > ,(origin > > > > > > > > @@ -2058,7 +2058,7 @@ responsive, and powerful applications with minima= l effort.") > > > > (for-each (lambda (source target) > > > > (format #t "Processing ~a --> ~a~%" > > > > source target) > > > > - (let ((minified (open-pipe* OPEN_READ= "uglify-js" source))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ= "uglifyjs" source))) > > (call-with-output-file target > > (lambda (port) > > (dump-port minified port))))) > > > > > > > > @@ -2073,7 +2073,7 @@ responsive, and powerful applications with minima= l effort.") > > > > (inputs > > > > `(("js-requirejs" ,js-requirejs))) > > > > (native-inputs > > > > - `(("uglify-js" ,uglify-js) > > > > > > > > - `(("node-uglify-js" ,node-uglify-js) > > ("js-jquery" > > ,(origin > > (method url-fetch) > > > > > > > > @@ -2111,7 +2111,7 @@ supports interactive trees, to enable rich, edita= ble trees in Shiny.") > > > > (lambda _ > > > > (with-directory-excursion "inst/AdminLTE" > > > > (delete-file "app.min.js") > > > > - (let ((minified (open-pipe* OPEN_READ "uglify-js" "ap= p.js"))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ "uglifyjs" "app= .js"))) > > (call-with-output-file "app.min.js" > > (lambda (port) > > (dump-port minified port)))))))))) > > > > > > > > @@ -2120,7 +2120,7 @@ supports interactive trees, to enable rich, edita= ble trees in Shiny.") > > > > ("r-promises" ,r-promises) > > > > ("r-shiny" ,r-shiny))) > > > > (native-inputs > > > > - `(("uglify-js" ,uglify-js))) > > > > > > > > - `(("node-uglify-js" ,node-uglify-js))) > > > > > > (home-page "https://rstudio.github.io/shinydashboard/") > > > > (synopsis "Create dashboards with shiny") > > > > (description "This package provides an extension to the Shiny web > > > > @@ -14849,7 +14849,7 @@ to easily call your own custom JavaScript f= unctions from R.") > > > > (format #t "Processing ~a --> ~a~%" > > > > source target) > > > > (delete-file target) > > > > - (let ((minified (open-pipe* OPEN_READ= "uglify-js" source))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ= "uglifyjs" source))) > > (call-with-output-file target > > (lambda (port) > > (dump-port minified port))))) > > > > > > > > @@ -14865,7 +14865,7 @@ to easily call your own custom JavaScript funct= ions from R.") > > > > ("r-shinyjs" ,r-shinyjs))) > > > > (native-inputs > > > > `(("r-knitr" ,r-knitr) > > > > - ("uglify-js" ,uglify-js) > > > > > > > > - ("node-uglify-js" ,node-uglify-js) > > ("js-jquery" > > ,(origin > > (method url-fetch) > > > > > > > > @@ -17276,7 +17276,7 @@ and Learning to Rank measures (LambdaMart).") > > > > (format #t "Processing ~a --> ~a~%" > > > > source target) > > > > (delete-file target) > > > > - (let ((minified (open-pipe* OPEN_READ= "uglify-js" source))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ= "uglifyjs" source))) > > (call-with-output-file target > > (lambda (port) > > (dump-port minified port))))) > > > > > > > > @@ -17288,7 +17288,7 @@ and Learning to Rank measures (LambdaMart).") > > > > ("r-htmlwidgets" ,r-htmlwidgets) > > > > ("r-igraph" ,r-igraph))) > > > > (native-inputs > > > > - `(("uglify-js" ,uglify-js) > > > > > > > > - `(("node-uglify-js" ,node-uglify-js) > > ("js-jquery" > > ,(origin > > (method url-fetch) > > > > > > > > @@ -17523,7 +17523,7 @@ etc.). Text boxes with automatic word wrap are = also supported.") > > > > (for-each (lambda (source target) > > > > (format #t "Processing ~a --> ~a~%" > > > > source target) > > > > - (let ((minified (open-pipe* OPEN_READ= "uglify-js" source))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ= "uglifyjs" source))) > > (call-with-output-file target > > (lambda (port) > > (dump-port minified port))))) > > > > > > > > @@ -17537,7 +17537,7 @@ etc.). Text boxes with automatic word wrap are = also supported.") > > > > ("r-rmarkdown" ,r-rmarkdown) > > > > ("r-shiny" ,r-shiny))) > > > > (native-inputs > > > > - `(("uglify-js" ,uglify-js) > > > > > > > > - `(("node-uglify-js" ,node-uglify-js) > > ("js-raphael" > > ,(origin > > (method url-fetch) > > > > > > > > @@ -19380,14 +19380,14 @@ tools for help in data interpretation.") > > > > (for-each (lambda (source target) > > > > (format #t "Processing ~a --> ~a~%" > > > > source target) > > > > - (let ((minified (open-pipe* OPEN_READ= "uglify-js" source))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ= "uglifyjs" source))) > > (call-with-output-file target > > (lambda (port) > > (dump-port minified port))))) > > sources targets)))) > > #t))))) > > > > > > (native-inputs > > > > - `(("uglify-js" ,uglify-js) > > > > > > > > - `(("node-uglify-js" ,node-uglify-js) > > ;; NOTE: Make sure that this version of d3 is still valid whe= n > > ;; upgrading the package. > > ("d3.v4.js" > > > > > > > > @@ -19645,14 +19645,14 @@ cell free DNA} (cfDNA).") > > > > (for-each (lambda (source target) > > > > (format #t "Processing ~a --> ~a~%" > > > > source target) > > > > - (let ((minified (open-pipe* OPEN_READ= "uglify-js" source))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ= "uglifyjs" source))) > > (call-with-output-file target > > (lambda (port) > > (dump-port minified port))))) > > sources targets)))) > > #t))))) > > > > > > (native-inputs > > > > - `(("uglify-js" ,uglify-js) > > > > > > > > - `(("node-uglify-js" ,node-uglify-js) > > ("intro.js" > > ,(origin > > (method url-fetch) > > > > > > > > @@ -23716,14 +23716,14 @@ documents, Shiny applications, Plumber APIs, = plots, and static web content.") > > > > (for-each (lambda (source target) > > > > (format #t "Processing ~a --> ~a~%" > > > > source target) > > > > - (let ((minified (open-pipe* OPEN_READ= "uglify-js" source))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ= "uglifyjs" source))) > > (call-with-output-file target > > (lambda (port) > > (dump-port minified port))))) > > sources targets)))) > > #t))))) > > > > > > (native-inputs > > > > - `(("uglify-js" ,uglify-js) > > > > > > > > - `(("uglify-js" ,node-uglify-js) > > ;; They actually use version 1.11.1, but this more recent ver= sion > > ;; should be just fine. > > ("js-jquery" > > > > > > > > diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm > > > > index a935d321c5..2dc1c330a2 100644 > > > > --- a/gnu/packages/javascript.scm > > > > +++ b/gnu/packages/javascript.scm > > > > @@ -26,7 +26,7 @@ > > > > #:use-module (gnu packages) > > > > #:use-module (gnu packages base) > > > > #:use-module (gnu packages compression) > > > > - #:use-module (gnu packages lisp-xyz) > > > > - #:use-module (gnu packages node-xyz) > > > > #:use-module (gnu packages readline) > > > > #:use-module (gnu packages web) > > > > #:use-module (guix packages) > > > > @@ -163,7 +163,7 @@ context menu in TypeScript.") > > > > (cond > > > > ((string-match "\\.js$" file) > > > > (mkdir-p (dirname installed)) > > > > - (let ((minified (open-pipe* OPEN_READ "uglify-js" = file))) > > > > > > > > - (let ((minified (open-pipe* OPEN_READ "uglifyjs" f= ile))) > > (call-with-output-file installed > > (lambda (port) > > (dump-port minified port))) > > > > > > > > @@ -179,7 +179,7 @@ context menu in TypeScript.") > > > > (native-inputs > > > > `(("font-mathjax" ,font-mathjax) > > > > ("glibc-utf8-locales" ,glibc-utf8-locales) > > > > - ("uglify-js" ,uglify-js) > > > > > > > > - ("node-uglify-js" ,node-uglify-js) > > ,@(package-native-inputs font-mathjax))) > > > > > > (synopsis "JavaScript display engine for LaTeX, MathML, and AsciiMa= th") > > > > (description "MathJax is a JavaScript display engine for LaTeX, Mat= hML, > > > > diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm > > > > index a4a5d6f543..3c891162ee 100644 > > > > --- a/gnu/packages/lisp-xyz.scm > > > > +++ b/gnu/packages/lisp-xyz.scm > > > > @@ -1276,58 +1276,6 @@ compressor. It works on data produced by @co= de{parse-js} to generate a > > > > (define-public ecl-cl-uglify-js > > > > (sbcl-package->ecl-package sbcl-cl-uglify-js)) > > It would be better to keep this and deprecate it, then people will have > > a warning that it's changed. > > (define-public uglify-js > > (deprecated-package "uglify-js" node-uglify-js)) > > > -(define-public uglify-js > > > > - (package > > - (inherit sbcl-cl-uglify-js) > > - (name "uglify-js") > > - (build-system trivial-build-system) > > - (arguments > > - `(#:modules ((guix build utils)) > > > > > > - #:builder > > > > > > - (let* ((bin (string-append (assoc-ref %outputs "out") "/bi= n/")) > > > > > > - (script (string-append bin "uglify-js"))) > > > > > > - (use-modules (guix build utils)) > > > > > > - (mkdir-p bin) > > > > > > - (with-output-to-file script > > > > > > - (lambda _ > > > > > > - (format #t "#!~a/bin/sbcl --script > > > > > > > > - (require :asdf) > > - (asdf:initialize-source-registry > > - #p\"~a/etc/common-lisp/source-registry.conf.d/\") > > - (asdf:initialize-output-translations > > - #p\"~a/etc/common-lisp/asdf-output-translations.conf.d/\")" > > - (assoc-ref %build-inputs "sbcl") > > > > > > - (assoc-ref %build-inputs "sbcl-cl-uglify-js") > > > > > > - (assoc-ref %build-inputs "sbcl-cl-uglify-js")) > > > > > > - ;; FIXME: cannot use progn here because otherwise it fa= ils to > > > > > > - ;; find cl-uglify-js. > > > > > > - (for-each > > > > > > - write > > > > > > - '(;; Quiet, please! > > > > > > - (let ((*standard-output* (make-broadcast-stream)) > > > > > > - (*error-output* (make-broadcast-stream))) > > > > > > - (asdf:load-system :cl-uglify-js)) > > > > > > - (let ((file (cadr *posix-argv*))) > > > > > > - (if file > > > > > > - (format t "~a" > > > > > > - (cl-uglify-js:ast-gen-code > > > > > > - (cl-uglify-js:ast-mangle > > > > > > - (cl-uglify-js:ast-squeeze > > > > > > - (with-open-file (in file) > > > > > > - (parse-js:parse-js = in)))) > > > > > > - :beautify nil)) > > > > > > - (progn > > > > > > - (format *error-output* > > > > > > - "Please provide a JavaScript file.~%"= ) > > > > > > - (sb-ext:exit :code 1)))))))) > > > > > > - (chmod script #o755) > > > > > > - #t))) > > > > > > - (inputs > > - `(("sbcl" ,sbcl) > > > > > > - ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js))) > > > > > > - (synopsis "JavaScript compressor"))) > > > > (define-public sbcl-cl-strings > > > > (let ((revision "1") > > > > (commit "c5c5cbafbf3e6181d03c354d66e41a4f063f00ae")) > > > > diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm > > > > index 7818b44d9e..3661fdb0c4 100644 > > > > --- a/gnu/packages/node-xyz.scm > > > > +++ b/gnu/packages/node-xyz.scm > > > > @@ -357,3 +357,27 @@ if desired.") > > > > (description "Acornjs is a Javascrip parser with many options and an > > > > architecture supporting plugins.") > > > > (license license:expat))) > > > > + > > > > +(define-public node-uglify-js > > > > - (package > > - (name "node-uglify-js") > > - (version "3.13.9") > > - (source > > - (origin > > > > > > - (method url-fetch) > > > > > > - (uri (string-append > > > > > > - "https://github.com/mishoo/UglifyJS/archive/refs/tags/v= " > > > > > > - version ".tar.gz")) > > > > > > This one also should be downloaded using git-fetch. > > > - (sha256 > > > > > > - (base32 "0dpgkqwyrkqlvixwl841375s134slnj3h0viff1cpxq81mxqph0= 9")))) > > > > > > - (build-system node-build-system) > > - (inputs > > - `(("semver" ,node-semver) > > > > > > - ("acorn" ,node-acorn))) > > > > > > - (home-page "https://lisperator.net/uglifyjs/") > > - (synopsis "JavaScript parser / mangler / compressor / beautifier to= olkit") > > Make sure you have two spaces between each sentence. > > > - (description "UglifyJS is a JavaScript compressor/minifier written = in > > > > +JavaScript. It also contains tools that allow one to automate work= ing with > > > > +JavaScript code: parser, code generator, compressor, mangler, scop= e analyzer, > > > > +tree walker, and tree transformer.") > > - (license license:bsd-2))) > > > > diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm > > > > index 412308b417..6d39103b5b 100644 > > > > --- a/gnu/packages/web.scm > > > > +++ b/gnu/packages/web.scm > > > > @@ -138,7 +138,7 @@ > > > > #:use-module (gnu packages libunistring) > > > > #:use-module (gnu packages libunwind) > > > > #:use-module (gnu packages linux) > > > > - #:use-module (gnu packages lisp-xyz) > > > > - #:use-module (gnu packages node-xyz) > > > > #:use-module (gnu packages lsof) > > > > #:use-module (gnu packages lua) > > > > #:use-module (gnu packages mail) > > > > @@ -7759,7 +7759,7 @@ compressed JSON header blocks. > > > > (native-inputs > > > > `(("autoconf" ,autoconf) > > > > ("automake" ,automake) > > > > - ("uglify-js" ,uglify-js) > > > > > > > > - ("node-uglify-js" ,node-uglify-js) > > ("pkg-config" ,pkg-config))) > > (inputs > > `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")= ) > > > > > > > > diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.sc= m > > > > index 28a6781c06..add6b9f080 100644 > > > > --- a/guix/build-system/minify.scm > > > > +++ b/guix/build-system/minify.scm > > > > @@ -44,8 +44,8 @@ > > > > (define (default-uglify-js) > > > > "Return the default package to minify JavaScript source files." > > > > ;; Lazily resolve the binding to avoid a circular dependency. > > > > - (let ((mod (resolve-interface '(gnu packages lisp-xyz)))) > > - (module-ref mod 'uglify-js))) > > > > - (let ((mod (resolve-interface '(gnu packages node-xyz)))) > > - (module-ref mod 'node-uglify-js))) > > > > (define* (lower name > > > > #:key source inputs native-inputs outputs system > > > > diff --git a/guix/build/minify-build-system.scm b/guix/build/minify-bui= ld-system.scm > > > > index 92158a033f..c5a876726f 100644 > > > > --- a/guix/build/minify-build-system.scm > > > > +++ b/guix/build/minify-build-system.scm > > > > @@ -39,7 +39,7 @@ > > > > (format #t "minifying ~a\n" file) > > > > (let* ((base (basename file ".js")) > > > > (installed (or target (string-append directory base ".min.js"))) > > > > - (minified (open-pipe* OPEN_READ "uglify-js" file))) > > > > > > > > - (minified (open-pipe* OPEN_READ "uglifyjs" file))) > > > > > > (call-with-output-file installed > > > > (cut dump-port minified <>)) > > > > #t)) > > > > -- > > > > 2.32.0 > > -- > > Efraim Flashner efraim@flashner.co.il =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 > > GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 > > Confidentiality cannot be guaranteed on emails sent or received unencrypt= ed --b1_roenYISMFTdqn0VQHNOvw9juMiHE0fqB5lU0T1J1leM Content-Type: text/x-patch; name=0003-gnu-Add-uglifyjs.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-gnu-Add-uglifyjs.patch RnJvbSA2ZjBhYzFiNTljNjU4MGQ0OGYwY2FiY2IyMjM3YTZhNmUzMzA5MDUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaGFybGVzIDxjaGFybGVzLmIuamFja3NvbkBwcm90b25tYWls LmNvbT4KRGF0ZTogTW9uLCAxMiBKdWwgMjAyMSAyMjo0OTowNiAtMDUwMApTdWJqZWN0OiBbUEFU Q0ggMy80XSBnbnU6IEFkZCB1Z2xpZnlqcy4KCiogZ251L3BhY2thZ2VzL3VnbGlmeWpzLnNjbSAo dWdsaWZ5anMpOiBBZGQgbmV3IG1vZHVsZS4KLS0tCiBnbnUvcGFja2FnZXMvdWdsaWZ5anMuc2Nt IHwgMjEgKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0aW9u cygrKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdlcy91Z2xpZnlqcy5zY20KCmRpZmYg LS1naXQgYS9nbnUvcGFja2FnZXMvdWdsaWZ5anMuc2NtIGIvZ251L3BhY2thZ2VzL3VnbGlmeWpz LnNjbQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwLi5jZTlmNDJlMTI0Ci0t LSAvZGV2L251bGwKKysrIGIvZ251L3BhY2thZ2VzL3VnbGlmeWpzLnNjbQpAQCAtMCwwICsxLDIx IEBACis7OzsgR05VIEd1aXggLS0tIEZ1bmN0aW9uYWwgcGFja2FnZSBtYW5hZ2VtZW50IGZvciBH TlUKKzs7OyBDb3B5cmlnaHQgwqkgMjAyMSBDaGFybGVzIDxjaGFybGVzLmIuamFja3NvbkBwcm90 b25tYWlsLmNvbT4KKzs7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC4KKzs7OworOzs7 IEdOVSBHdWl4IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9v ciBtb2RpZnkgaXQKKzs7OyB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorOzs7IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRp b247IGVpdGhlciB2ZXJzaW9uIDMgb2YgdGhlIExpY2Vuc2UsIG9yIChhdAorOzs7IHlvdXIgb3B0 aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKzs7OworOzs7IEdOVSBHdWl4IGlzIGRpc3RyaWJ1dGVk IGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsIGJ1dAorOzs7IFdJVEhPVVQgQU5Z IFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKzs7OyBNRVJD SEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhl Cis7OzsgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKzs7Owor Ozs7IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlCis7OzsgYWxvbmcgd2l0aCBHTlUgR3VpeC4gIElmIG5vdCwgc2VlIDxodHRw Oi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4KKworKGRlZmluZS1tb2R1bGUgKGdudSBwYWNrYWdl cyB1Z2xpZnlqcykKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbm9kZS14eXopKQorCiso ZGVmaW5lLXB1YmxpYyB1Z2xpZnlqcyBub2RlLXVnbGlmeS1qcykKLS0gCjIuMzIuMAoK --b1_roenYISMFTdqn0VQHNOvw9juMiHE0fqB5lU0T1J1leM Content-Type: text/x-patch; name=0002-gnu-Add-node-uglify-js.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-gnu-Add-node-uglify-js.patch RnJvbSAzN2I0NmUzZjI1YzlhMjdjZGM2YmI4Zjc4YzBlYzI5Yzc3NTlhN2EwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaGFybGVzIDxjaGFybGVzLmIuamFja3NvbkBwcm90b25tYWls LmNvbT4KRGF0ZTogTW9uLCAxMiBKdWwgMjAyMSAyMjoyNzozNSAtMDUwMApTdWJqZWN0OiBbUEFU Q0ggMi80XSBnbnU6IEFkZCBub2RlLXVnbGlmeS1qcy4KCiogZ251L3BhY2thZ2VzL25vZGUteHl6 LnNjbSAobm9kZS11Z2xpZnktanMpOiBBZGQgbmV3IHZhcmlhYmxlLgotLS0KIGdudS9wYWNrYWdl cy9ub2RlLXh5ei5zY20gfCAyNyArKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBj aGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL25vZGUt eHl6LnNjbSBiL2dudS9wYWNrYWdlcy9ub2RlLXh5ei5zY20KaW5kZXggZGM4YWU4YmI5NC4uOWUy ZjVhNWU5OCAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL25vZGUteHl6LnNjbQorKysgYi9nbnUv cGFja2FnZXMvbm9kZS14eXouc2NtCkBAIC0zNjAsMyArMzYwLDMwIEBAIGlmIGRlc2lyZWQuIikK ICAgICAgIChkZXNjcmlwdGlvbiAiQWNvcm5qcyBpcyBhIEphdmFzY3JpcCBwYXJzZXIgd2l0aCBt YW55IG9wdGlvbnMgYW5kIGFuCiBhcmNoaXRlY3R1cmUgc3VwcG9ydGluZyBwbHVnaW5zLiIpCiAg ICAgICAobGljZW5zZSBsaWNlbnNlOmV4cGF0KSkpKQorCisoZGVmaW5lLXB1YmxpYyBub2RlLXVn bGlmeS1qcworICAobGV0ICgoY29tbWl0ICJiMjNiMzMzZDlkNmU5N2JlY2U5MGZiN2JjMzdhNDQ4 NzBhN2ZlY2Y3IikKKyAgICAgICAgKHJldmlzaW9uICIxIikpCisgICAgKHBhY2thZ2UKKyAgICAg IChuYW1lICJub2RlLXVnbGlmeS1qcyIpCisgICAgICAodmVyc2lvbiAoZ2l0LXZlcnNpb24gIjMu MTMuOSIgcmV2aXNpb24gY29tbWl0KSkKKyAgICAgIChzb3VyY2UKKyAgICAgICAob3JpZ2luCisg ICAgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKKyAgICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UK KyAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9taXNob28vVWdsaWZ5SlMi KQorICAgICAgICAgICAgICAgKGNvbW1pdCBjb21taXQpKSkKKyAgICAgICAgIChnaXQtZmlsZS1u YW1lIG5hbWUgdmVyc2lvbikKKyAgICAgICAgIChzaGEyNTYKKyAgICAgICAgICAoYmFzZTMyICIw NnloYTE3ZjlxeTc5Y2k4aDNzZ3ZnOHg5bDM0OGFwOTVjNGEzeTlsbjZjNXN5enlsNnJkIikpKSkK KyAgICAgIChidWlsZC1zeXN0ZW0gbm9kZS1idWlsZC1zeXN0ZW0pCisgICAgICAoaW5wdXRzCisg ICAgICAgYCgoInNlbXZlciIgLG5vZGUtc2VtdmVyKQorICAgICAgICAgKCJhY29ybiIgLG5vZGUt YWNvcm4pKSkKKyAgICAgIChob21lLXBhZ2UgImh0dHBzOi8vbGlzcGVyYXRvci5uZXQvdWdsaWZ5 anMvIikKKyAgICAgIChzeW5vcHNpcyAiSmF2YVNjcmlwdCBwYXJzZXIgLyBtYW5nbGVyIC8gY29t cHJlc3NvciAvIGJlYXV0aWZpZXIgdG9vbGtpdCIpCisgICAgICAoZGVzY3JpcHRpb24gIlVnbGlm eUpTIGlzIGEgSmF2YVNjcmlwdCBjb21wcmVzc29yL21pbmlmaWVyIHdyaXR0ZW4gaW4KK0phdmFT Y3JpcHQuIEl0IGFsc28gY29udGFpbnMgdG9vbHMgdGhhdCBhbGxvdyBvbmUgdG8gYXV0b21hdGUg d29ya2luZyB3aXRoCitKYXZhU2NyaXB0IGNvZGU6IHBhcnNlciwgY29kZSBnZW5lcmF0b3IsIGNv bXByZXNzb3IsIG1hbmdsZXIsIHNjb3BlIGFuYWx5emVyLAordHJlZSB3YWxrZXIsIGFuZCB0cmVl IHRyYW5zZm9ybWVyLiIpCisgICAgICAobGljZW5zZSBsaWNlbnNlOmJzZC0yKSkpKQotLSAKMi4z Mi4wCgo= --b1_roenYISMFTdqn0VQHNOvw9juMiHE0fqB5lU0T1J1leM Content-Type: text/x-patch; name=0004-build-Use-updated-Uglifyjs-for-minify-build-system.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0004-build-Use-updated-Uglifyjs-for-minify-build-system.patch RnJvbSBjMjAwZDE1YzRmYzRmZmY0ZTdjMzM5NjA4YjA4MzU3OWYwNGI4NTM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaGFybGVzIDxjaGFybGVzLmIuamFja3NvbkBwcm90b25tYWls LmNvbT4KRGF0ZTogTW9uLCAxMiBKdWwgMjAyMSAyMjo1MDo0NCAtMDUwMApTdWJqZWN0OiBbUEFU Q0ggNC80XSBidWlsZDogVXNlIHVwZGF0ZWQgVWdsaWZ5anMgZm9yIG1pbmlmeS1idWlsZC1zeXN0 ZW0uCgoqIGd1aXgvYnVpbGQtc3lzdGVtL21pbmlmeS5zY20gKGRlZmF1bHQtdWdsaWZ5LWpzKTog VXBkYXRlIHVnbGlmeS1qcyBwYWNrYWdlIHVzZWQuCiogZ3VpeC9idWlsZC9taW5pZnktYnVpbGQt c3lzdGVtLnNjbSAobWluaWZ5KTogVXNlIHVwZGF0ZWQgVWdsaWZ5SnMgY29tbWFuZCBuYW1lLgot LS0KIGd1aXgvYnVpbGQtc3lzdGVtL21pbmlmeS5zY20gICAgICAgfCA0ICsrLS0KIGd1aXgvYnVp bGQvbWluaWZ5LWJ1aWxkLXN5c3RlbS5zY20gfCAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDMgaW5z ZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ndWl4L2J1aWxkLXN5c3Rl bS9taW5pZnkuc2NtIGIvZ3VpeC9idWlsZC1zeXN0ZW0vbWluaWZ5LnNjbQppbmRleCAyOGE2Nzgx YzA2Li45ZDUzNzYwNjg1IDEwMDY0NAotLS0gYS9ndWl4L2J1aWxkLXN5c3RlbS9taW5pZnkuc2Nt CisrKyBiL2d1aXgvYnVpbGQtc3lzdGVtL21pbmlmeS5zY20KQEAgLTQ0LDggKzQ0LDggQEAKIChk ZWZpbmUgKGRlZmF1bHQtdWdsaWZ5LWpzKQogICAiUmV0dXJuIHRoZSBkZWZhdWx0IHBhY2thZ2Ug dG8gbWluaWZ5IEphdmFTY3JpcHQgc291cmNlIGZpbGVzLiIKICAgOzsgTGF6aWx5IHJlc29sdmUg dGhlIGJpbmRpbmcgdG8gYXZvaWQgYSBjaXJjdWxhciBkZXBlbmRlbmN5LgotICAobGV0ICgobW9k IChyZXNvbHZlLWludGVyZmFjZSAnKGdudSBwYWNrYWdlcyBsaXNwLXh5eikpKSkKLSAgICAobW9k dWxlLXJlZiBtb2QgJ3VnbGlmeS1qcykpKQorICAobGV0ICgobW9kIChyZXNvbHZlLWludGVyZmFj ZSAnKGdudSBwYWNrYWdlcyB1Z2xpZnlqcykpKSkKKyAgICAobW9kdWxlLXJlZiBtb2QgJ3VnbGlm eWpzKSkpCiAKIChkZWZpbmUqIChsb3dlciBuYW1lCiAgICAgICAgICAgICAgICAgIzprZXkgc291 cmNlIGlucHV0cyBuYXRpdmUtaW5wdXRzIG91dHB1dHMgc3lzdGVtCmRpZmYgLS1naXQgYS9ndWl4 L2J1aWxkL21pbmlmeS1idWlsZC1zeXN0ZW0uc2NtIGIvZ3VpeC9idWlsZC9taW5pZnktYnVpbGQt c3lzdGVtLnNjbQppbmRleCA5MjE1OGEwMzNmLi5jNWE4NzY3MjZmIDEwMDY0NAotLS0gYS9ndWl4 L2J1aWxkL21pbmlmeS1idWlsZC1zeXN0ZW0uc2NtCisrKyBiL2d1aXgvYnVpbGQvbWluaWZ5LWJ1 aWxkLXN5c3RlbS5zY20KQEAgLTM5LDcgKzM5LDcgQEAKICAgKGZvcm1hdCAjdCAibWluaWZ5aW5n IH5hXG4iIGZpbGUpCiAgIChsZXQqICgoYmFzZSAoYmFzZW5hbWUgZmlsZSAiLmpzIikpCiAgICAg ICAgICAoaW5zdGFsbGVkIChvciB0YXJnZXQgKHN0cmluZy1hcHBlbmQgZGlyZWN0b3J5IGJhc2Ug Ii5taW4uanMiKSkpCi0gICAgICAgICAobWluaWZpZWQgKG9wZW4tcGlwZSogT1BFTl9SRUFEICJ1 Z2xpZnktanMiIGZpbGUpKSkKKyAgICAgICAgIChtaW5pZmllZCAob3Blbi1waXBlKiBPUEVOX1JF QUQgInVnbGlmeWpzIiBmaWxlKSkpCiAgICAgKGNhbGwtd2l0aC1vdXRwdXQtZmlsZSBpbnN0YWxs ZWQKICAgICAgIChjdXQgZHVtcC1wb3J0IG1pbmlmaWVkIDw+KSkKICAgICAjdCkpCi0tIAoyLjMy LjAKCg== --b1_roenYISMFTdqn0VQHNOvw9juMiHE0fqB5lU0T1J1leM Content-Type: text/x-patch; name=0001-gnu-Add-node-acorn.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-Add-node-acorn.patch RnJvbSAzMjFjMmUzMmE3YTc4NTg3NDAxZGM1ZDY4MzQ2ODYwM2M5YTZkMTM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaGFybGVzIDxjaGFybGVzLmIuamFja3NvbkBwcm90b25tYWls LmNvbT4KRGF0ZTogU2F0LCAyNiBKdW4gMjAyMSAxNDozMzoxOSAtMDUwMApTdWJqZWN0OiBbUEFU Q0ggMS80XSBnbnU6IEFkZCBub2RlLWFjb3JuLgoKKiBnbnUvcGFja2FnZXMvbm9kZS14eXouc2Nt IChub2RlLWFjb3JuKTogQWRkIG5ldyB2YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMvbm9kZS14 eXouc2NtIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdl ZCwgMzAgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9ub2RlLXh5ei5z Y20gYi9nbnUvcGFja2FnZXMvbm9kZS14eXouc2NtCmluZGV4IDI3YTc2ZjU5YzMuLmRjOGFlOGJi OTQgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9ub2RlLXh5ei5zY20KKysrIGIvZ251L3BhY2th Z2VzL25vZGUteHl6LnNjbQpAQCAtMiw2ICsyLDcgQEAKIDs7OyBDb3B5cmlnaHQgwqkgMjAyMCBF ZnJhaW0gRmxhc2huZXIgPGVmcmFpbUBmbGFzaG5lci5jby5pbD4KIDs7OyBDb3B5cmlnaHQgwqkg MjAyMCBHaWFjb21vIExlaWRpIDxnb29kb2xkcGF1bEBhdXRpc3RpY2kub3JnPgogOzs7IENvcHly aWdodCDCqSAyMDIxIE5vaXN5dG9vdCA8bm9pc3l0b290QGRpc3Jvb3Qub3JnPgorOzs7IENvcHly aWdodCDCqSAyMDIxIENoYXJsZXMgPGNoYXJsZXMuYi5qYWNrc29uQHByb3Rvbm1haWwuY29tPgog Ozs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsKQEAgLTMzMCwzICsz MzEsMzIgQEAgZnVuY3Rpb24gd2l0aCBicm93c2VyIHN1cHBvcnQuIikKIFN1YnNlcXVlbnQgY2Fs bHMgd2lsbCBlaXRoZXIgcmV0dXJuIHRoZSBjYWNoZWQgcHJldmlvdXMgdmFsdWUgb3IgdGhyb3cg YW4gZXJyb3IKIGlmIGRlc2lyZWQuIikKICAgICAobGljZW5zZSBsaWNlbnNlOmlzYykpKQorCiso ZGVmaW5lLXB1YmxpYyBub2RlLWFjb3JuCisgIChsZXQgKChjb21taXQgIjllZjQwZDhhZTJjMDhl MDdmZDJmNTEwYmVkNThjM2NhOWVkY2JlNDYiKQorICAgICAgICAocmV2aXNpb24gIjEiKSkKKyAg ICAocGFja2FnZQorICAgICAgKG5hbWUgIm5vZGUtYWNvcm4iKQorICAgICAgKHZlcnNpb24gKGdp dC12ZXJzaW9uICI4LjQuMSIgcmV2aXNpb24gY29tbWl0KSkKKyAgICAgIChzb3VyY2UKKyAgICAg ICAob3JpZ2luCisgICAgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKKyAgICAgICAgICh1cmkgKGdp dC1yZWZlcmVuY2UKKyAgICAgICAgICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9hY29y bmpzL2Fjb3JuIikKKyAgICAgICAgICAgICAgIChjb21taXQgY29tbWl0KSkpCisgICAgICAgICAo ZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCisgICAgICAgICAoc2hhMjU2 CisgICAgICAgICAgKGJhc2UzMiAiMDY4aDVneXN6OGJic2xxMzFkdmE4ZjIyM3JkZjhsN3c2bnhj eGpudjR6ZHByd2t6a2hhYSIpKSkpCisgICAgICAoYnVpbGQtc3lzdGVtIG5vZGUtYnVpbGQtc3lz dGVtKQorICAgICAgKGFyZ3VtZW50cworICAgICAgICcoIzpwaGFzZXMKKyAgICAgICAgIChtb2Rp ZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKKyAgICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNr ICdjaGFuZ2UtZGlyZWN0b3J5CisgICAgICAgICAgICAgKGxhbWJkYSBfCisgICAgICAgICAgICAg ICAoY2hkaXIgImFjb3JuIikKKyAgICAgICAgICAgICAgICN0KSkpKSkKKyAgICAgIChob21lLXBh Z2UgImh0dHBzOi8vZ2l0aHViLmNvbS9hY29ybmpzL2Fjb3JuL3RyZWUvbWFzdGVyL2Fjb3JuIikK KyAgICAgIChzeW5vcHNpcyAiQSBzbWFsbCwgZmFzdCwgSmF2YXNjcmlwdC1iYXNlZCBKYXZhc2Ny aXB0IHBhcnNlciIpCisgICAgICAoZGVzY3JpcHRpb24gIkFjb3JuanMgaXMgYSBKYXZhc2NyaXAg cGFyc2VyIHdpdGggbWFueSBvcHRpb25zIGFuZCBhbgorYXJjaGl0ZWN0dXJlIHN1cHBvcnRpbmcg cGx1Z2lucy4iKQorICAgICAgKGxpY2Vuc2UgbGljZW5zZTpleHBhdCkpKSkKLS0gCjIuMzIuMAoK --b1_roenYISMFTdqn0VQHNOvw9juMiHE0fqB5lU0T1J1leM--