me/guix
Archived
1
0
Fork 0
Code Activity

gnu: r-rjava: Update to 1.0-11.

Browse source 
* 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
This commit is contained in:
Ricardo Wurmus 2024-01-30 15:48:08 +01:00
parent 1bb0d6355c
commit 1541c1bb17
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/cran.scm
View file

@ -23968,32 +23968,20 @@ the corresponding outputs (tables and graphs).")
(define-public r-rjava (define-public r-rjava
(package (package
(name "r-rjava") (name "r-rjava")
(version "1.0-10") (version "1.0-11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rJava" version)) (uri (cran-uri "rJava" version))
(sha256 (sha256
(base32 (base32
"0srrjfqrcp7b6k62qv3d18r97k6kbcz0g4pn2y0rv0f5wlc6i0mm")) "05v4k0vzv1yx80b5dgmp6l7q3w64cr3k5a29hvggg1ixapswr84y"))))
(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"))) (properties `((upstream-name . "rJava")))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
(list (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 #:phases
#~(modify-phases (@ (guix build r-build-system) %standard-phases) #~(modify-phases %standard-phases
(add-after 'unpack 'set-JAVA_HOME (add-after 'unpack 'set-JAVA_HOME
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((jdk (assoc-ref inputs "jdk"))) (let ((jdk (assoc-ref inputs "jdk")))
@ -24005,27 +23993,11 @@ the corresponding outputs (tables and graphs).")
(setenv "JAVA_CPPFLAGS" (setenv "JAVA_CPPFLAGS"
(string-append "-I" jdk "/include " (string-append "-I" jdk "/include "
"-I" jdk "/include/linux")) "-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 (inputs
`(("icu4c" ,icu4c) `(("icu4c" ,icu4c)
("jdk" ,openjdk11 "jdk") ("jdk" ,openjdk11 "jdk")
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs
(list esbuild))
(home-page "https://www.rforge.net/rJava/") (home-page "https://www.rforge.net/rJava/")
(synopsis "Low-Level R to Java interface") (synopsis "Low-Level R to Java interface")
(description (description