me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Update some packages using old JavaScript minifier.

Browse source 
* 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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/bioinformatics.scm
View file

@ -106,7 +106,6 @@
#:use-module (gnu packages jemalloc) #:use-module (gnu packages jemalloc)
#:use-module (gnu packages jupyter) #:use-module (gnu packages jupyter)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages logging) #:use-module (gnu packages logging)
#:use-module (gnu packages lsof) #:use-module (gnu packages lsof)
#:use-module (gnu packages machine-learning) #:use-module (gnu packages machine-learning)
@ -148,6 +147,7 @@
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages uglifyjs)
#:use-module (gnu packages vim) #:use-module (gnu packages vim)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages wget) #:use-module (gnu packages wget)
@ -9318,7 +9318,7 @@ Browser.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((file (assoc-ref inputs "plotly.js")) (let* ((file (assoc-ref inputs "plotly.js"))
(installed "plotly/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 (call-with-output-file installed
(cut dump-port minified <>)))) (cut dump-port minified <>))))
#t)) #t))
@ -9376,7 +9376,7 @@ Browser.")
"v1.39.4/dist/plotly.js")) "v1.39.4/dist/plotly.js"))
(sha256 (sha256
(base32 "138mwsr4nf5qif4mrxx286mpnagxd1xwl6k8aidrjgknaqg88zyr")))) (base32 "138mwsr4nf5qif4mrxx286mpnagxd1xwl6k8aidrjgknaqg88zyr"))))
("uglify-js" ,uglify-js))) ("uglifyjs" ,node-uglify-js)))
(home-page "https://www.bioinformatics.babraham.ac.uk/projects/bismark/") (home-page "https://www.bioinformatics.babraham.ac.uk/projects/bismark/")
(synopsis "Map bisulfite treated sequence reads and analyze methylation") (synopsis "Map bisulfite treated sequence reads and analyze methylation")
(description "Bismark is a program to map bisulfite treated sequencing (description "Bismark is a program to map bisulfite treated sequencing

8
gnu/packages/ci.scm
View file

@ -38,7 +38,6 @@
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz) #:use-module (gnu packages guile-xyz)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages mail) #:use-module (gnu packages mail)
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -48,6 +47,7 @@
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages uglifyjs)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -252,7 +252,7 @@ intended as a replacement for Hydra.")
(let* ((file (let* ((file
(assoc-ref inputs (string-append name ".js"))) (assoc-ref inputs (string-append name ".js")))
(port (port
(open-pipe* OPEN_READ "uglify-js" file)) (open-pipe* OPEN_READ "uglifyjs" file))
(destination (destination
(string-append (string-append
"../build/js/" name ".min.js"))) "../build/js/" name ".min.js")))
@ -263,7 +263,7 @@ intended as a replacement for Hydra.")
(let ((exit (close-pipe port))) (let ((exit (close-pipe port)))
(unless (zero? exit) (unless (zero? exit)
(error "uglify-js failed" exit))))) (error "uglifyjs failed" exit)))))
'("vue" '("vue"
"vue-router" "vue-router"
@ -282,7 +282,7 @@ intended as a replacement for Hydra.")
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("googletest" ,googletest) `(("googletest" ,googletest)
("uglify-js" ,uglify-js) ("uglifyjs" ,node-uglify-js)
("vue.js" ("vue.js"
,(origin (method url-fetch) ,(origin (method url-fetch)

32
gnu/packages/cran.scm
View file

@ -84,7 +84,6 @@
#:use-module (gnu packages java) #:use-module (gnu packages java)
#:use-module (gnu packages javascript) #:use-module (gnu packages javascript)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages machine-learning) #:use-module (gnu packages machine-learning)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
@ -104,6 +103,7 @@
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages uglifyjs)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages web) #:use-module (gnu packages web)
@ -2110,7 +2110,7 @@ previewing themes in real time.")
("js-strftime" ,js-strftime) ("js-strftime" ,js-strftime)
("js-highlight" ,js-highlight))) ("js-highlight" ,js-highlight)))
(native-inputs (native-inputs
`(("uglify-js" ,uglify-js) `(("uglifyjs" ,node-uglify-js)
("gfortran" ,gfortran) ("gfortran" ,gfortran)
("js-bootstrap-accessibility" ("js-bootstrap-accessibility"
,(origin ,(origin
@ -2177,7 +2177,7 @@ responsive, and powerful applications with minimal effort.")
(for-each (lambda (source target) (for-each (lambda (source target)
(format #t "Processing ~a --> ~a~%" (format #t "Processing ~a --> ~a~%"
source target) source target)
(let ((minified (open-pipe* OPEN_READ "uglify-js" source))) (let ((minified (open-pipe* OPEN_READ "uglifyjs" source)))
(call-with-output-file target (call-with-output-file target
(lambda (port) (lambda (port)
(dump-port minified port))))) (dump-port minified port)))))
@ -2192,7 +2192,7 @@ responsive, and powerful applications with minimal effort.")
(inputs (inputs
`(("js-requirejs" ,js-requirejs))) `(("js-requirejs" ,js-requirejs)))
(native-inputs (native-inputs
`(("uglify-js" ,uglify-js) `(("uglifyjs" ,node-uglify-js)
("js-jquery" ("js-jquery"
,(origin ,(origin
(method url-fetch) (method url-fetch)
@ -2230,7 +2230,7 @@ supports interactive trees, to enable rich, editable trees in Shiny.")
(lambda _ (lambda _
(with-directory-excursion "inst/AdminLTE" (with-directory-excursion "inst/AdminLTE"
(delete-file "app.min.js") (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" (call-with-output-file "app.min.js"
(lambda (port) (lambda (port)
(dump-port minified port)))))))))) (dump-port minified port))))))))))
@ -2239,7 +2239,7 @@ supports interactive trees, to enable rich, editable trees in Shiny.")
("r-promises" ,r-promises) ("r-promises" ,r-promises)
("r-shiny" ,r-shiny))) ("r-shiny" ,r-shiny)))
(native-inputs (native-inputs
`(("uglify-js" ,uglify-js))) `(("uglifyjs" ,node-uglify-js)))
(home-page "https://rstudio.github.io/shinydashboard/") (home-page "https://rstudio.github.io/shinydashboard/")
(synopsis "Create dashboards with shiny") (synopsis "Create dashboards with shiny")
(description "This package provides an extension to the Shiny web (description "This package provides an extension to the Shiny web
@ -15423,7 +15423,7 @@ to easily call your own custom JavaScript functions from R.")
(format #t "Processing ~a --> ~a~%" (format #t "Processing ~a --> ~a~%"
source target) source target)
(delete-file 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 (call-with-output-file target
(lambda (port) (lambda (port)
(dump-port minified port))))) (dump-port minified port)))))
@ -15439,7 +15439,7 @@ to easily call your own custom JavaScript functions from R.")
("r-shinyjs" ,r-shinyjs))) ("r-shinyjs" ,r-shinyjs)))
(native-inputs (native-inputs
`(("r-knitr" ,r-knitr) `(("r-knitr" ,r-knitr)
("uglify-js" ,uglify-js) ("uglifyjs" ,node-uglify-js)
("js-jquery" ("js-jquery"
,(origin ,(origin
(method url-fetch) (method url-fetch)
@ -17929,7 +17929,7 @@ and Learning to Rank measures (LambdaMart).")
(format #t "Processing ~a --> ~a~%" (format #t "Processing ~a --> ~a~%"
source target) source target)
(delete-file 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 (call-with-output-file target
(lambda (port) (lambda (port)
(dump-port minified port))))) (dump-port minified port)))))
@ -17941,7 +17941,7 @@ and Learning to Rank measures (LambdaMart).")
("r-htmlwidgets" ,r-htmlwidgets) ("r-htmlwidgets" ,r-htmlwidgets)
("r-igraph" ,r-igraph))) ("r-igraph" ,r-igraph)))
(native-inputs (native-inputs
`(("uglify-js" ,uglify-js) `(("uglifyjs" ,node-uglify-js)
("js-jquery" ("js-jquery"
,(origin ,(origin
(method url-fetch) (method url-fetch)
@ -18201,7 +18201,7 @@ etc.). Text boxes with automatic word wrap are also supported.")
(for-each (lambda (source target) (for-each (lambda (source target)
(format #t "Processing ~a --> ~a~%" (format #t "Processing ~a --> ~a~%"
source target) source target)
(let ((minified (open-pipe* OPEN_READ "uglify-js" source))) (let ((minified (open-pipe* OPEN_READ "uglifyjs" source)))
(call-with-output-file target (call-with-output-file target
(lambda (port) (lambda (port)
(dump-port minified port))))) (dump-port minified port)))))
@ -18215,7 +18215,7 @@ etc.). Text boxes with automatic word wrap are also supported.")
("r-rmarkdown" ,r-rmarkdown) ("r-rmarkdown" ,r-rmarkdown)
("r-shiny" ,r-shiny))) ("r-shiny" ,r-shiny)))
(native-inputs (native-inputs
`(("uglify-js" ,uglify-js) `(("uglifyjs" ,node-uglify-js)
("js-raphael" ("js-raphael"
,(origin ,(origin
(method url-fetch) (method url-fetch)
@ -20213,14 +20213,14 @@ tools for help in data interpretation.")
(for-each (lambda (source target) (for-each (lambda (source target)
(format #t "Processing ~a --> ~a~%" (format #t "Processing ~a --> ~a~%"
source target) source target)
(let ((minified (open-pipe* OPEN_READ "uglify-js" source))) (let ((minified (open-pipe* OPEN_READ "uglifyjs" source)))
(call-with-output-file target (call-with-output-file target
(lambda (port) (lambda (port)
(dump-port minified port))))) (dump-port minified port)))))
sources targets)))) sources targets))))
#t))))) #t)))))
(native-inputs (native-inputs
`(("uglify-js" ,uglify-js) `(("uglifyjs" ,node-uglify-js)
;; NOTE: Make sure that this version of d3 is still valid when ;; NOTE: Make sure that this version of d3 is still valid when
;; upgrading the package. ;; upgrading the package.
("d3.v4.js" ("d3.v4.js"
@ -24566,14 +24566,14 @@ documents, Shiny applications, Plumber APIs, plots, and static web content.")
(for-each (lambda (source target) (for-each (lambda (source target)
(format #t "Processing ~a --> ~a~%" (format #t "Processing ~a --> ~a~%"
source target) source target)
(let ((minified (open-pipe* OPEN_READ "uglify-js" source))) (let ((minified (open-pipe* OPEN_READ "uglifyjs" source)))
(call-with-output-file target (call-with-output-file target
(lambda (port) (lambda (port)
(dump-port minified port))))) (dump-port minified port)))))
sources targets)))) sources targets))))
#t))))) #t)))))
(native-inputs (native-inputs
`(("uglify-js" ,uglify-js) `(("uglifyjs" ,node-uglify-js)
;; They actually use version 1.11.1, but this more recent version ;; They actually use version 1.11.1, but this more recent version
;; should be just fine. ;; should be just fine.
("js-jquery" ("js-jquery"

11
gnu/packages/javascript.scm
View file

@ -26,8 +26,8 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages uglifyjs)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -163,14 +163,14 @@ context menu in TypeScript.")
(cond (cond
((string-match "\\.js$" file) ((string-match "\\.js$" file)
(mkdir-p (dirname installed)) (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 (call-with-output-file installed
(lambda (port) (lambda (port)
(dump-port minified port))) (dump-port minified port)))
(let ((exit (close-pipe minified))) (let ((exit (close-pipe minified)))
(unless (zero? exit) (unless (zero? exit)
(error "dear, uglify-js failed" exit))))) (error "dear, uglifyjs failed" exit)))))
(else (else
(install-file file (dirname installed)))))) (install-file file (dirname installed))))))
(find-files ".")) (find-files "."))
@ -179,7 +179,7 @@ context menu in TypeScript.")
(native-inputs (native-inputs
`(("font-mathjax" ,font-mathjax) `(("font-mathjax" ,font-mathjax)
("glibc-utf8-locales" ,glibc-utf8-locales) ("glibc-utf8-locales" ,glibc-utf8-locales)
("uglify-js" ,uglify-js) ("uglifyjs" ,node-uglify-js)
,@(package-native-inputs font-mathjax))) ,@(package-native-inputs font-mathjax)))
(synopsis "JavaScript display engine for LaTeX, MathML, and AsciiMath") (synopsis "JavaScript display engine for LaTeX, MathML, and AsciiMath")
(description "MathJax is a JavaScript display engine for LaTeX, MathML, (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 `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-uglification (add-after 'unpack 'fix-uglification
;; Remove "export" keyword which prevents the file from being ;; Remove "export" keyword. That keyword is not present in
;; uglified by uglify-js. Moreover, that keyword is not present in
;; the minified version of the library some projects are using, ;; the minified version of the library some projects are using,
;; e.g., ;; e.g.,
;; <https://github.com/jmoenig/Snap--Build-Your-Own-Blocks/blob/master/FileSaver.min.js> ;; <https://github.com/jmoenig/Snap--Build-Your-Own-Blocks/blob/master/FileSaver.min.js>