diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2024-01-30 15:48:08 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2024-01-30 15:48:08 +0100 |
| commit | 1541c1bb17ed82778cba71946793b2cd69d5ac97 (patch) | |
| tree | 179486240aa788e4db042845d2b5f12596b18d6d /gnu | |
| parent | 1bb0d6355c341d0b42e76cc2f2f8e8979d23d5ae (diff) | |
gnu: r-rjava: Update to 1.0-11.
* gnu/packages/cran.scm (r-rjava): Update to 1.0-11.
[source]: Remove snippet.
[arguments]: Remove 'replace-bundled-minified-JavaScript phase.
[native-inputs]: Remove esbuild.
Change-Id: I008810b6919412023fc419d9cbadfea0fe2892bb
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/cran.scm | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b709d24578..7741556d66 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23968,32 +23968,20 @@ the corresponding outputs (tables and graphs).") (define-public r-rjava (package (name "r-rjava") - (version "1.0-10") + (version "1.0-11") (source (origin (method url-fetch) (uri (cran-uri "rJava" version)) (sha256 (base32 - "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"))))) + "05v4k0vzv1yx80b5dgmp6l7q3w64cr3k5a29hvggg1ixapswr84y")))) (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 (@ (guix build r-build-system) %standard-phases) + #~(modify-phases %standard-phases (add-after 'unpack 'set-JAVA_HOME (lambda* (#:key inputs #:allow-other-keys) (let ((jdk (assoc-ref inputs "jdk"))) @@ -24005,27 +23993,11 @@ 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"))))) - (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"))))))))) + (setenv "JAVA_LIBS" (search-input-file inputs "/lib/libjvm.so")))))))) (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 |