From patchwork Mon Sep 20 19:30:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles X-Patchwork-Id: 33215 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B67C027BBE3; Mon, 20 Sep 2021 20:32:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C9FD427BBE1 for ; Mon, 20 Sep 2021 20:32:14 +0100 (BST) Received: from localhost ([::1]:37206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSP1R-0005zl-IR for patchwork@mira.cbaines.net; Mon, 20 Sep 2021 15:32:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSP1G-0005wO-A7 for guix-patches@gnu.org; Mon, 20 Sep 2021 15:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mSP1F-0002DP-UN for guix-patches@gnu.org; Mon, 20 Sep 2021 15:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mSP1F-00039G-Re for guix-patches@gnu.org; Mon, 20 Sep 2021 15:32:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50702] Update some packages using old JavaScript minifier Resent-From: Charles Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Sep 2021 19:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50702 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 50702@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.163216628610430 (code B ref -1); Mon, 20 Sep 2021 19:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Sep 2021 19:31:26 +0000 Received: from localhost ([127.0.0.1]:44084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSP0f-0002hR-8k for submit@debbugs.gnu.org; Mon, 20 Sep 2021 15:31:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:39544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSP0d-0002fP-EB for submit@debbugs.gnu.org; Mon, 20 Sep 2021 15:31:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSP0d-0005FV-4W for guix-patches@gnu.org; Mon, 20 Sep 2021 15:31:23 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]:55311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSP0a-0001Ry-40 for guix-patches@gnu.org; Mon, 20 Sep 2021 15:31:22 -0400 Date: Mon, 20 Sep 2021 19:30:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1632166263; bh=V6/Y+qtAkiFwsPLsW0BOKL2wC+YWHIXDp+J4VHpeLnQ=; h=Date:To:From:Reply-To:Subject:From; b=TWmUFPOqUKNihxmJAAzc1kz+qtaMuzwY5QuQSJ/6Euro+IZQAz5lm+XHh0NFemHrz 92w0Dir8f0I6HyiDivhSffC9s3agSLNWO1JDDkYfu4emRz5EUm8KXPnwaXGDpmllJU THJhwy6enAMKFpovh48h7mnpzMfD2vdokGzyL4Dc= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.24; envelope-from=charles.b.jackson@protonmail.com; helo=mail-4324.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Charles X-ACL-Warn: , Charles via Guix-patches X-Patchwork-Original-From: Charles via Guix-patches via From: Charles X-getmail-retrieved-from-mailbox: Patches This is in response to bug#50483: [R] Package r-shiny: Shiny server logic inactive. 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