From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CCltKso77GAhNAEAgWs5BA (envelope-from ) for ; Mon, 12 Jul 2021 14:55:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id KC0+Jso77GBRMgAA1q6Kng (envelope-from ) for ; Mon, 12 Jul 2021 12:55:38 +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 11B3410294 for ; Mon, 12 Jul 2021 14:55:38 +0200 (CEST) Received: from localhost ([::1]:38234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vTF-0005br-53 for larch@yhetil.org; Mon, 12 Jul 2021 08:55:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vSg-0005Va-9C for guix-patches@gnu.org; Mon, 12 Jul 2021 08:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vSf-00022z-Vp for guix-patches@gnu.org; Mon, 12 Jul 2021 08:55:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2vSf-00022H-Uk for guix-patches@gnu.org; Mon, 12 Jul 2021 08:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49242] Update UglifyJs (& dependencies) and update dependents Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jul 2021 12:55:01 +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: Charles Cc: 49242@debbugs.gnu.org Received: via spool by 49242-submit@debbugs.gnu.org id=B49242.16260944497743 (code B ref 49242); Mon, 12 Jul 2021 12:55:01 +0000 Received: (at 49242) by debbugs.gnu.org; 12 Jul 2021 12:54:09 +0000 Received: from localhost ([127.0.0.1]:36743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2vRm-00020k-6s for submit@debbugs.gnu.org; Mon, 12 Jul 2021 08:54:09 -0400 Received: from flashner.co.il ([178.62.234.194]:56988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2vRh-000206-VJ for 49242@debbugs.gnu.org; Mon, 12 Jul 2021 08:54:04 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id 1ACEC40297; Mon, 12 Jul 2021 12:53:56 +0000 (UTC) Date: Mon, 12 Jul 2021 15:52:19 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Charles , 49242@debbugs.gnu.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="MMKOqirIaTetQheR" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626094538; h=from:from:sender:sender: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; bh=ugqY+v1hUqvzi81M+T/HR9JJ/kSFYfPEskUnW1UPRvU=; b=m0kY4Agx2yKZEuYZMHgC0XF6TnP5UiWOI1ngR4u+y6eGr3WzLmQIW7fXTUP4JGzLySkZLu gPf2JvLrq+QlnUdtUi3i0JzvHY9PUJofmyt9gkNIA9OrI9AhefsAMYBwS6SHVT1Faf1aQT lgF5fmLr0vFaJ8QlGtrOD2/XVB791ZEOV2Y7sUGKU0lOny68AsAtUuW6jkEphLKvvzCmv/ rzidocBm0YIkprHa61Xe3cyaj1SU9YPihkCGfYcB9o0FoApoq5g9TQw8g41amztRhCADnC l3lgLiwaN1yIHUeB6yH7GzP0HkPaH0qM6sFETbSAi5Hbh+cSCdJBAqg6ydm/ug== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626094538; a=rsa-sha256; cv=none; b=VYxtMlwixE2g/z1kx7zPHNhGaGJiLNkUpy9MMQ2TWpERV30R21/DtRLguF5GWlGOftNKzL MnNAIvk8fYl0XTeq4DCpotjAobOV+OY/Khjlm0oFtqPCfMnkIk5lvpC84maE0+5yveqqL5 vAxYa8aOyIoLDKsmghdbMsbd3i1X8dIUpK/4VSdrW/mWk14wUzNpN6AJXdXbsMVGOsHpkV YX55LHPKBXkT4dtArq98tpqbHh4UQ/hNSpxSannwvENN4ho0XX0yqJssTSsxGXuxEhz+BB HFcOs/p1i/mQiOLI3mUSZPmxkZxbsSDdHzpLa2TNcszGI0ASkp5AgTe67hYYmA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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: -4.00 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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: 11B3410294 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: Qkh6v8RYl7rW --MMKOqirIaTetQheR Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 wrot= e: > From 53b96b21be2946e84e9687096313557a83c2e103 Mon Sep 17 00:00:00 2001 > From: Charles > Date: Sat, 26 Jun 2021 14:44:23 -0500 > Subject: [PATCH] gnu: Update UglifyJs. >=20 > This change is to update the UglifyJs library. This updated Javascript > implementation is by the same author as the original Common Lisp version = and > is the official successor. It supports many commonly found features of > ECMAscript 6. >=20 > * 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(-) >=20 > diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatic= s.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" file))) > + (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 "138mwsr4nf5qif4mrxx286mpnagxd1xwl6k8aidrjgknaqg88zy= r")))) > - ("uglify-js" ,uglify-js))) > + ("node-uglify-js" ,node-uglify-js))) > (home-page "https://www.bioinformatics.babraham.ac.uk/projects/bisma= rk/") > (synopsis "Map bisulfite treated sequence reads and analyze methylat= ion") > (description "Bismark is a program to map bisulfite treated sequenci= ng > 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 "= =2Ejs"))) > (port > - (open-pipe* OPEN_READ "uglify-js" file)) > + (open-pipe* OPEN_READ "uglifyjs" file)) > (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) > =20 > ("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 minimal = effort.") > (for-each (lambda (source target) > (format #t "Processing ~a --> ~a~%" > source target) > - (let ((minified (open-pipe* OPEN_READ "ug= lify-js" source))) > + (let ((minified (open-pipe* OPEN_READ "ug= lifyjs" source))) > (call-with-output-file target > (lambda (port) > (dump-port minified port))))) > @@ -2073,7 +2073,7 @@ responsive, and powerful applications with minimal = 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, editabl= e trees in Shiny.") > (lambda _ > (with-directory-excursion "inst/AdminLTE" > (delete-file "app.min.js") > - (let ((minified (open-pipe* OPEN_READ "uglify-js" "app.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, editabl= e 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 functio= ns from R.") > (format #t "Processing ~a --> ~a~%" > source target) > (delete-file target) > - (let ((minified (open-pipe* OPEN_READ "ug= lify-js" source))) > + (let ((minified (open-pipe* OPEN_READ "ug= lifyjs" source))) > (call-with-output-file target > (lambda (port) > (dump-port minified port))))) > @@ -14865,7 +14865,7 @@ to easily call your own custom JavaScript functio= ns 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 "ug= lify-js" source))) > + (let ((minified (open-pipe* OPEN_READ "ug= lifyjs" 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 a= lso supported.") > (for-each (lambda (source target) > (format #t "Processing ~a --> ~a~%" > source target) > - (let ((minified (open-pipe* OPEN_READ "ug= lify-js" source))) > + (let ((minified (open-pipe* OPEN_READ "ug= lifyjs" source))) > (call-with-output-file target > (lambda (port) > (dump-port minified port))))) > @@ -17537,7 +17537,7 @@ etc.). Text boxes with automatic word wrap are a= lso 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 "ug= lify-js" source))) > + (let ((minified (open-pipe* OPEN_READ "ug= lifyjs" 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 when > ;; 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 "ug= lify-js" source))) > + (let ((minified (open-pipe* OPEN_READ "ug= lifyjs" 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, pl= ots, and static web content.") > (for-each (lambda (source target) > (format #t "Processing ~a --> ~a~%" > source target) > - (let ((minified (open-pipe* OPEN_READ "ug= lify-js" source))) > + (let ((minified (open-pipe* OPEN_READ "ug= lifyjs" 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 version > ;; 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" file)= )) > (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 AsciiMat= h") > (description "MathJax is a JavaScript display engine for LaTeX, Math= ML, > 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 @code{pa= rse-js} to generate a > (define-public ecl-cl-uglify-js > (sbcl-package->ecl-package sbcl-cl-uglify-js)) > =20 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") "/bin/")) > - (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 fails = 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 "0dpgkqwyrkqlvixwl841375s134slnj3h0viff1cpxq81mxqph09"))= )) > + (build-system node-build-system) > + (inputs > + `(("semver" ,node-semver) > + ("acorn" ,node-acorn))) > + (home-page "https://lisperator.net/uglifyjs/") > + (synopsis "JavaScript parser / mangler / compressor / beautifier too= lkit") 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 working wi= th > +JavaScript code: parser, code generator, compressor, mangler, scope anal= yzer, > +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.scm > 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))) > =20 > (define* (lower name > #:key source inputs native-inputs outputs system > diff --git a/guix/build/minify-build-system.scm b/guix/build/minify-build= -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)) > --=20 > 2.32.0 >=20 --=20 Efraim Flashner =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 unencrypted --MMKOqirIaTetQheR Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmDsOwMACgkQQarn3Mo9 g1HDxBAApZvJNlc48G/Cg3FIXZ1zyZofJDJbdlsywi6OG3nJgj4ap93ifYjXqd64 /iJXgLRCNCruFZTX19r5UiBI+hVj9eLBDf6BMOpGxdiJTrk0zZ/ucyeMudNBfcPS UiW1hVy58fAlRbZmmDZ2gKxcz0OJCjwENbvjO/rN5S9Kp8I3nQ4ptg2eS74Me8Oj PNmOi4xsTA95x2HhTE5Q9fAsRT4SLMjjKaEqpuvKcShtYFS/9wnm3j/YvOlKxmmY cBv8mT2MJBrlJMXkrJdRltZyN+JH4+TWSGbznE/SNnbYx6d277gylMkNhwh+nCAL VcJaDiWt2hTzZpl7WYhjRDQiQw1b58fsDGaCCAK3t2p2rHNW6ZlH87rnvg1dNfdX 5gjs/KXPFIztvKLw8ihM+3mOCOpwZV/XuIHm9YpIhlxoD8Zo1gh5jcHEofIcc55b gvqFldHyxhIIxRUS0uez3xDh/puiduFpOFscWT1kOfCrHwHdU4iLYXdsooOPb5l6 Fgd5Qv8K556j/xtzOYPyITJA3uR91XGBoCVPK235uf8Wrp68cjCljVmmVbUwp1hs vPCngld3QLYtBv5WgJB+lZXAnI+DVByiWBGSG4cCulLw9ErrJ72RBK+QVCSsQGHQ WnerrFtrxKxJXCOXYREbaoFsPASe1LKka1kLnvFda9tGF9uOFsI= =mf28 -----END PGP SIGNATURE----- --MMKOqirIaTetQheR--