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.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Charles 2021-09-18 00:05:55 -05:00 committed by Efraim Flashner
parent cd5145875e
commit f36b789f78
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
4 changed files with 28 additions and 29 deletions

View file

@ -106,7 +106,6 @@ (define-module (gnu packages bioinformatics)
#: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)
@ -148,6 +147,7 @@ (define-module (gnu packages bioinformatics)
#: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)
@ -9318,7 +9318,7 @@ (define-public bismark
(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))
@ -9376,7 +9376,7 @@ (define-public bismark
"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

View file

@ -38,7 +38,6 @@ (define-module (gnu packages ci)
#: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 @@ (define-module (gnu packages ci)
#: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 @@ (define-public laminar
(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 @@ (define-public laminar
(let ((exit (close-pipe port)))
(unless (zero? exit)
(error "uglify-js failed" exit)))))
(error "uglifyjs failed" exit)))))
'("vue"
"vue-router"
@ -282,7 +282,7 @@ (define-public laminar
("zlib" ,zlib)))
(native-inputs
`(("googletest" ,googletest)
("uglify-js" ,uglify-js)
("uglifyjs" ,node-uglify-js)
("vue.js"
,(origin (method url-fetch)

View file

@ -84,7 +84,6 @@ (define-module (gnu packages cran)
#: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 @@ (define-module (gnu packages cran)
#: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)
@ -2110,7 +2110,7 @@ (define-public r-shiny
("js-strftime" ,js-strftime)
("js-highlight" ,js-highlight)))
(native-inputs
`(("uglify-js" ,uglify-js)
`(("uglifyjs" ,node-uglify-js)
("gfortran" ,gfortran)
("js-bootstrap-accessibility"
,(origin
@ -2177,7 +2177,7 @@ (define-public r-shinytree
(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)))))
@ -2192,7 +2192,7 @@ (define-public r-shinytree
(inputs
`(("js-requirejs" ,js-requirejs)))
(native-inputs
`(("uglify-js" ,uglify-js)
`(("uglifyjs" ,node-uglify-js)
("js-jquery"
,(origin
(method url-fetch)
@ -2230,7 +2230,7 @@ (define-public r-shinydashboard
(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))))))))))
@ -2239,7 +2239,7 @@ (define-public r-shinydashboard
("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
@ -15423,7 +15423,7 @@ (define-public r-colourpicker
(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)))))
@ -15439,7 +15439,7 @@ (define-public r-colourpicker
("r-shinyjs" ,r-shinyjs)))
(native-inputs
`(("r-knitr" ,r-knitr)
("uglify-js" ,uglify-js)
("uglifyjs" ,node-uglify-js)
("js-jquery"
,(origin
(method url-fetch)
@ -17929,7 +17929,7 @@ (define-public r-threejs
(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)))))
@ -17941,7 +17941,7 @@ (define-public r-threejs
("r-htmlwidgets" ,r-htmlwidgets)
("r-igraph" ,r-igraph)))
(native-inputs
`(("uglify-js" ,uglify-js)
`(("uglifyjs" ,node-uglify-js)
("js-jquery"
,(origin
(method url-fetch)
@ -18201,7 +18201,7 @@ (define-public r-flexdashboard
(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)))))
@ -18215,7 +18215,7 @@ (define-public r-flexdashboard
("r-rmarkdown" ,r-rmarkdown)
("r-shiny" ,r-shiny)))
(native-inputs
`(("uglify-js" ,uglify-js)
`(("uglifyjs" ,node-uglify-js)
("js-raphael"
,(origin
(method url-fetch)
@ -20213,14 +20213,14 @@ (define-public r-networkd3
(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"
@ -24566,14 +24566,14 @@ (define-public r-dygraphs
(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"

View file

@ -26,8 +26,8 @@ (define-module (gnu packages javascript)
#: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 @@ (define-public js-mathjax
(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 @@ (define-public js-mathjax
(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 @@ (define-public js-filesaver
`(#: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.,
;; <https://github.com/jmoenig/Snap--Build-Your-Own-Blocks/blob/master/FileSaver.min.js>