From 033d88e881a079a5373922ee844a3e36e5ae299e Mon Sep 17 00:00:00 2001 From: Charles Date: Sat, 18 Sep 2021 00:05:55 -0500 Subject: [PATCH] gnu: Update some packages using old JavaScript minifier. * gnu/packages/minetest.scm (minetest-basic-trains): New variable. * gnu/packages/bioinformatics.scm (bismark): Update uglifyjs input. * gnu/packages/ci.scm (laminar): Update uglifyjs input. * gnu/packages/cran.scm (r-shiny r-shinytree r-shinydashboard r-colourpicker r-threejs r-flexdashboard r-networkd3 r-dygraphs): Update uglifyjs input. * gnu/packages/javascript.scm (js-mathjax): Update uglifyjs input. --- gnu/packages/bioinformatics.scm | 6 +++--- gnu/packages/ci.scm | 8 ++++---- gnu/packages/cran.scm | 32 ++++++++++++++++---------------- gnu/packages/javascript.scm | 11 +++++------ 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ee85ab1a06..4f6d7d384a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -105,7 +105,6 @@ #:use-module (gnu packages jemalloc) #:use-module (gnu packages jupyter) #: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) @@ -147,6 +146,7 @@ #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages uglifyjs) #:use-module (gnu packages vim) #:use-module (gnu packages web) #:use-module (gnu packages wget) @@ -9284,7 +9284,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)) @@ -9342,7 +9342,7 @@ Browser.") "v1.39.4/dist/plotly.js")) (sha256 (base32 "138mwsr4nf5qif4mrxx286mpnagxd1xwl6k8aidrjgknaqg88zyr")))) - ("uglify-js" ,uglify-js))) + ("uglifyjs" ,node-uglify-js))) (home-page "https://www.bioinformatics.babraham.ac.uk/projects/bismark/") (synopsis "Map bisulfite treated sequence reads and analyze methylation") (description "Bismark is a program to map bisulfite treated sequencing diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index b7ea77ca31..6bcf7711a5 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -38,7 +38,6 @@ #: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 mail) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) @@ -48,6 +47,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages texinfo) + #:use-module (gnu packages uglifyjs) #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) @@ -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" file)) + (open-pipe* OPEN_READ "uglifyjs" file)) (destination (string-append "../build/js/" name ".min.js"))) @@ -263,7 +263,7 @@ intended as a replacement for Hydra.") (let ((exit (close-pipe port))) (unless (zero? exit) - (error "uglify-js failed" exit))))) + (error "uglifyjs failed" exit))))) '("vue" "vue-router" @@ -282,7 +282,7 @@ intended as a replacement for Hydra.") ("zlib" ,zlib))) (native-inputs `(("googletest" ,googletest) - ("uglify-js" ,uglify-js) + ("uglifyjs" ,node-uglify-js) ("vue.js" ,(origin (method url-fetch) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f80256c901..660b687bb9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -84,7 +84,6 @@ #: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) @@ -104,6 +103,7 @@ #:use-module (gnu packages tcl) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) + #:use-module (gnu packages uglifyjs) #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages web) @@ -2084,7 +2084,7 @@ previewing themes in real time.") ("js-strftime" ,js-strftime) ("js-highlight" ,js-highlight))) (native-inputs - `(("uglify-js" ,uglify-js) + `(("uglifyjs" ,node-uglify-js) ("gfortran" ,gfortran) ("js-bootstrap-accessibility" ,(origin @@ -2151,7 +2151,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 "uglify-js" source))) + (let ((minified (open-pipe* OPEN_READ "uglifyjs" source))) (call-with-output-file target (lambda (port) (dump-port minified port))))) @@ -2166,7 +2166,7 @@ responsive, and powerful applications with minimal effort.") (inputs `(("js-requirejs" ,js-requirejs))) (native-inputs - `(("uglify-js" ,uglify-js) + `(("uglifyjs" ,node-uglify-js) ("js-jquery" ,(origin (method url-fetch) @@ -2204,7 +2204,7 @@ supports interactive trees, to enable rich, editable 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)))))))))) @@ -2213,7 +2213,7 @@ supports interactive trees, to enable rich, editable trees in Shiny.") ("r-promises" ,r-promises) ("r-shiny" ,r-shiny))) (native-inputs - `(("uglify-js" ,uglify-js))) + `(("uglifyjs" ,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 @@ -15397,7 +15397,7 @@ to easily call your own custom JavaScript functions 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))))) @@ -15413,7 +15413,7 @@ to easily call your own custom JavaScript functions from R.") ("r-shinyjs" ,r-shinyjs))) (native-inputs `(("r-knitr" ,r-knitr) - ("uglify-js" ,uglify-js) + ("uglifyjs" ,node-uglify-js) ("js-jquery" ,(origin (method url-fetch) @@ -17903,7 +17903,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))))) @@ -17915,7 +17915,7 @@ and Learning to Rank measures (LambdaMart).") ("r-htmlwidgets" ,r-htmlwidgets) ("r-igraph" ,r-igraph))) (native-inputs - `(("uglify-js" ,uglify-js) + `(("uglifyjs" ,node-uglify-js) ("js-jquery" ,(origin (method url-fetch) @@ -18175,7 +18175,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))))) @@ -18189,7 +18189,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) + `(("uglifyjs" ,node-uglify-js) ("js-raphael" ,(origin (method url-fetch) @@ -20187,14 +20187,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) + `(("uglifyjs" ,node-uglify-js) ;; NOTE: Make sure that this version of d3 is still valid when ;; upgrading the package. ("d3.v4.js" @@ -24540,14 +24540,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) + `(("uglifyjs" ,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 81de5b67a6..cdf9dd19fa 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -26,8 +26,8 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages compression) - #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages uglifyjs) #:use-module (gnu packages web) #:use-module (guix packages) #:use-module (guix download) @@ -163,14 +163,14 @@ 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))) (let ((exit (close-pipe minified))) (unless (zero? exit) - (error "dear, uglify-js failed" exit))))) + (error "dear, uglifyjs failed" exit))))) (else (install-file file (dirname installed)))))) (find-files ".")) @@ -179,7 +179,7 @@ context menu in TypeScript.") (native-inputs `(("font-mathjax" ,font-mathjax) ("glibc-utf8-locales" ,glibc-utf8-locales) - ("uglify-js" ,uglify-js) + ("uglifyjs" ,node-uglify-js) ,@(package-native-inputs font-mathjax))) (synopsis "JavaScript display engine for LaTeX, MathML, and AsciiMath") (description "MathJax is a JavaScript display engine for LaTeX, MathML, @@ -527,8 +527,7 @@ means that these shams cause many ES5 methods to silently fail.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-uglification - ;; Remove "export" keyword which prevents the file from being - ;; uglified by uglify-js. Moreover, that keyword is not present in + ;; Remove "export" keyword. That keyword is not present in ;; the minified version of the library some projects are using, ;; e.g., ;; -- 2.32.0