[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/195: gnu: r-rjava: Update to 1.0-10.
From: |
guix-commits |
Subject: |
01/195: gnu: r-rjava: Update to 1.0-10. |
Date: |
Fri, 15 Dec 2023 06:30:56 -0500 (EST) |
rekado pushed a commit to branch r-updates
in repository guix.
commit 378b91ed81df199373115d25903b96428e06b1d8
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Dec 12 10:39:30 2023 +0100
gnu: r-rjava: Update to 1.0-10.
* gnu/packages/cran.scm (r-rjava): Update to 1.0-10.
[source]: Delete bundled minified JavaScript.
[arguments]: Use minify-build-system in new phase
'replace-bundled-minified-JavaScript.
[native-inputs]: Add esbuild.
Change-Id: I6ca7724ea61f53995067cca8d6835fe061621567
---
gnu/packages/cran.scm | 36 ++++++++++++++++++++++++++++++++----
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 221a81612c..6c4c367427 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -23579,20 +23579,32 @@ the corresponding outputs (tables and graphs).")
(define-public r-rjava
(package
(name "r-rjava")
- (version "1.0-6")
+ (version "1.0-10")
(source
(origin
(method url-fetch)
(uri (cran-uri "rJava" version))
(sha256
(base32
- "1ijqhvnb8ab38cp9pwdf7zq7xqqlm6x94gkrab2dd98p6d4x1472"))))
+ "0srrjfqrcp7b6k62qv3d18r97k6kbcz0g4pn2y0rv0f5wlc6i0mm"))
+ (snippet
+ '(for-each delete-file
+ (list "inst/javadoc/jquery/jquery-ui.min.js"
+ "inst/javadoc/jquery/jszip/dist/jszip.min.js"
+
"inst/javadoc/jquery/jszip-utils/dist/jszip-utils-ie.min.js"
+
"inst/javadoc/jquery/jszip-utils/dist/jszip-utils.min.js")))))
(properties `((upstream-name . "rJava")))
(build-system r-build-system)
(arguments
(list
+ #:modules '((guix build r-build-system)
+ (guix build minify-build-system)
+ (guix build utils)
+ (ice-9 match))
+ #:imported-modules `(,@%r-build-system-modules
+ (guix build minify-build-system))
#:phases
- #~(modify-phases %standard-phases
+ #~(modify-phases (@ (guix build r-build-system) %standard-phases)
(add-after 'unpack 'set-JAVA_HOME
(lambda* (#:key inputs #:allow-other-keys)
(let ((jdk (assoc-ref inputs "jdk")))
@@ -23604,11 +23616,27 @@ the corresponding outputs (tables and graphs).")
(setenv "JAVA_CPPFLAGS"
(string-append "-I" jdk "/include "
"-I" jdk "/include/linux"))
- (setenv "JAVA_LIBS" (search-input-file inputs
"/lib/libjvm.so"))))))))
+ (setenv "JAVA_LIBS" (search-input-file inputs
"/lib/libjvm.so")))))
+ (add-after 'unpack 'replace-bundled-minified-JavaScript
+ (lambda _
+ (with-directory-excursion "inst/javadoc"
+ (for-each (match-lambda
+ ((source . target)
+ (minify source #:target target)))
+ `(("jquery/jquery-ui.js"
+ . "jquery/jquery-ui.min.js")
+ ("jquery/jszip/dist/jszip.js"
+ . "jquery/jszip/dist/jszip.min.js")
+ ("jquery/jszip-utils/dist/jszip-utils-ie.js"
+ . "jquery/jszip-utils/dist/jszip-utils-ie.min.js")
+ ("jquery/jszip-utils/dist/jszip-utils.js"
+ .
"jquery/jszip-utils/dist/jszip-utils.min.js")))))))))
(inputs
`(("icu4c" ,icu4c)
("jdk" ,openjdk11 "jdk")
("zlib" ,zlib)))
+ (native-inputs
+ (list esbuild))
(home-page "https://www.rforge.net/rJava/")
(synopsis "Low-Level R to Java interface")
(description
- branch r-updates created (now 23ae9cc345), guix-commits, 2023/12/15
- 01/195: gnu: r-rjava: Update to 1.0-10.,
guix-commits <=
- 02/195: gnu: r-pbdmpi: Update to 0.5-1., guix-commits, 2023/12/15
- 03/195: gnu: r-scales: Update to 1.3.0., guix-commits, 2023/12/15
- 04/195: gnu: r-spacyr: Update to 1.3.0., guix-commits, 2023/12/15
- 07/195: gnu: r-wgcna: Update to 1.72-5., guix-commits, 2023/12/15
- 09/195: gnu: r-bslib: Update to 0.6.1., guix-commits, 2023/12/15
- 11/195: gnu: r-crosstalk: Update to 1.2.1., guix-commits, 2023/12/15
- 06/195: gnu: r-spacetime: Update to 1.3-1., guix-commits, 2023/12/15
- 12/195: gnu: r-bookdown: Update to 0.37., guix-commits, 2023/12/15
- 25/195: gnu: r-v8: Update to 4.4.1., guix-commits, 2023/12/15
- 36/195: gnu: r-htmlwidgets: Update to 1.6.4., guix-commits, 2023/12/15