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 b709d24578e..7741556d665 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm | |||
| @@ -23968,32 +23968,20 @@ the corresponding outputs (tables and graphs).") | |||
| 23968 | (define-public r-rjava | 23968 | (define-public r-rjava |
| 23969 | (package | 23969 | (package |
| 23970 | (name "r-rjava") | 23970 | (name "r-rjava") |
| 23971 | (version "1.0-10") | 23971 | (version "1.0-11") |
| 23972 | (source | 23972 | (source |
| 23973 | (origin | 23973 | (origin |
| 23974 | (method url-fetch) | 23974 | (method url-fetch) |
| 23975 | (uri (cran-uri "rJava" version)) | 23975 | (uri (cran-uri "rJava" version)) |
| 23976 | (sha256 | 23976 | (sha256 |
| 23977 | (base32 | 23977 | (base32 |
| 23978 | "0srrjfqrcp7b6k62qv3d18r97k6kbcz0g4pn2y0rv0f5wlc6i0mm")) | 23978 | "05v4k0vzv1yx80b5dgmp6l7q3w64cr3k5a29hvggg1ixapswr84y")))) |
| 23979 | (snippet | ||
| 23980 | '(for-each delete-file | ||
| 23981 | (list "inst/javadoc/jquery/jquery-ui.min.js" | ||
| 23982 | "inst/javadoc/jquery/jszip/dist/jszip.min.js" | ||
| 23983 | "inst/javadoc/jquery/jszip-utils/dist/jszip-utils-ie.min.js" | ||
| 23984 | "inst/javadoc/jquery/jszip-utils/dist/jszip-utils.min.js"))))) | ||
| 23985 | (properties `((upstream-name . "rJava"))) | 23979 | (properties `((upstream-name . "rJava"))) |
| 23986 | (build-system r-build-system) | 23980 | (build-system r-build-system) |
| 23987 | (arguments | 23981 | (arguments |
| 23988 | (list | 23982 | (list |
| 23989 | #:modules '((guix build r-build-system) | ||
| 23990 | (guix build minify-build-system) | ||
| 23991 | (guix build utils) | ||
| 23992 | (ice-9 match)) | ||
| 23993 | #:imported-modules `(,@%r-build-system-modules | ||
| 23994 | (guix build minify-build-system)) | ||
| 23995 | #:phases | 23983 | #:phases |
| 23996 | #~(modify-phases (@ (guix build r-build-system) %standard-phases) | 23984 | #~(modify-phases %standard-phases |
| 23997 | (add-after 'unpack 'set-JAVA_HOME | 23985 | (add-after 'unpack 'set-JAVA_HOME |
| 23998 | (lambda* (#:key inputs #:allow-other-keys) | 23986 | (lambda* (#:key inputs #:allow-other-keys) |
| 23999 | (let ((jdk (assoc-ref inputs "jdk"))) | 23987 | (let ((jdk (assoc-ref inputs "jdk"))) |
| @@ -24005,27 +23993,11 @@ the corresponding outputs (tables and graphs).") | |||
| 24005 | (setenv "JAVA_CPPFLAGS" | 23993 | (setenv "JAVA_CPPFLAGS" |
| 24006 | (string-append "-I" jdk "/include " | 23994 | (string-append "-I" jdk "/include " |
| 24007 | "-I" jdk "/include/linux")) | 23995 | "-I" jdk "/include/linux")) |
| 24008 | (setenv "JAVA_LIBS" (search-input-file inputs "/lib/libjvm.so"))))) | 23996 | (setenv "JAVA_LIBS" (search-input-file inputs "/lib/libjvm.so")))))))) |
| 24009 | (add-after 'unpack 'replace-bundled-minified-JavaScript | ||
| 24010 | (lambda _ | ||
| 24011 | (with-directory-excursion "inst/javadoc" | ||
| 24012 | (for-each (match-lambda | ||
| 24013 | ((source . target) | ||
| 24014 | (minify source #:target target))) | ||
| 24015 | `(("jquery/jquery-ui.js" | ||
| 24016 | . "jquery/jquery-ui.min.js") | ||
| 24017 | ("jquery/jszip/dist/jszip.js" | ||
| 24018 | . "jquery/jszip/dist/jszip.min.js") | ||
| 24019 | ("jquery/jszip-utils/dist/jszip-utils-ie.js" | ||
| 24020 | . "jquery/jszip-utils/dist/jszip-utils-ie.min.js") | ||
| 24021 | ("jquery/jszip-utils/dist/jszip-utils.js" | ||
| 24022 | . "jquery/jszip-utils/dist/jszip-utils.min.js"))))))))) | ||
| 24023 | (inputs | 23997 | (inputs |
| 24024 | `(("icu4c" ,icu4c) | 23998 | `(("icu4c" ,icu4c) |
| 24025 | ("jdk" ,openjdk11 "jdk") | 23999 | ("jdk" ,openjdk11 "jdk") |
| 24026 | ("zlib" ,zlib))) | 24000 | ("zlib" ,zlib))) |
| 24027 | (native-inputs | ||
| 24028 | (list esbuild)) | ||
| 24029 | (home-page "https://www.rforge.net/rJava/") | 24001 | (home-page "https://www.rforge.net/rJava/") |
| 24030 | (synopsis "Low-Level R to Java interface") | 24002 | (synopsis "Low-Level R to Java interface") |
| 24031 | (description | 24003 | (description |
