From ed94b389470a7939534327007cd242e77ad5eaf7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Jan 2026 10:06:57 +0100 Subject: [PATCH] gnu: r-ctrdata: Update to 1.25.1. * gnu/packages/cran.scm (r-ctrdata): Update to 1.25.1. [source]: Update snippet to delete additional minified JavaScript file. [arguments]: Update 'process-javascript phase to process jstree source file. [propagated-inputs]: Remove r-xml2. [native-inputs]: Remove r-r-rsp; add jstree sources. Change-Id: I4abb6493aa7767a4ca72f43d42e0584b40fa2d6c Signed-off-by: Rutherther --- gnu/packages/cran.scm | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 447947d547b34f7e5d48ebf7da085e7d1c322523..0cabd24eb202fc29a5aa3518f93db602b2bf91b7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16368,18 +16368,19 @@ Jammalamadaka and A. @code{SenGupta}, World Scientific.") (define-public r-ctrdata (package (name "r-ctrdata") - (version "1.25.0") + (version "1.25.1") (source (origin (method url-fetch) (uri (cran-uri "ctrdata" version)) (sha256 (base32 - "0giingzzvx72pa0xcczx6dmk2ssqq4sd20m5m4v8dyxfyrkgq1lv")) - ;; TODO: we should also replace these other files: - ;; inst/htmlwidgets/lib/jstree/dist/jstree.min.js + "1z7vjzxam80lgrss78csfbqhprk9m14cdjpmx80g3p0db5kymycl")) + ;; TODO: we should also replace this other file: ;; inst/js/bundle.js (generated from inst/js/euctr2ndjson.js) (snippet - '(delete-file "inst/htmlwidgets/lib/jquery/dist/jquery.min.js")))) + '(begin + (delete-file "inst/htmlwidgets/lib/jquery/dist/jquery.min.js") + (delete-file "inst/htmlwidgets/lib/jstree/dist/jstree.min.js"))))) (properties `((upstream-name . "ctrdata"))) (build-system r-build-system) (arguments @@ -16396,13 +16397,15 @@ Jammalamadaka and A. @code{SenGupta}, World Scientific.") #~(modify-phases (@ (guix build r-build-system) %standard-phases) (add-after 'unpack 'process-javascript (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "inst/htmlwidgets/lib/jquery/dist" + (with-directory-excursion "inst/htmlwidgets/lib/" (for-each (match-lambda ((source . target) (minify source #:target target))) `((,(assoc-ref inputs "jquery-3.7.1.js") - . "jquery.min.js")))))) + . "jquery/dist/jquery.min.js") + (,(search-input-file inputs "/dist/jstree.js") + . "jstree/dist/jstree.min.js")))))) ;; Needed for vignettes (add-after 'unpack 'set-HOME (lambda _ (setenv "HOME" "/tmp")))))) @@ -16421,19 +16424,25 @@ Jammalamadaka and A. @code{SenGupta}, World Scientific.") r-stringi r-tidyr r-v8 - r-xml2 r-zip)) (native-inputs - (list esbuild - r-knitr - r-r-rsp - r-tinytest + (list esbuild r-knitr r-tinytest (origin (method url-fetch) (uri "https://code.jquery.com/jquery-3.7.1.js") (sha256 (base32 - "1zicjv44sx6n83vrkd2lwnlbf7qakzh3gcfjw0lhq48b5z55ma3q"))))) + "1zicjv44sx6n83vrkd2lwnlbf7qakzh3gcfjw0lhq48b5z55ma3q"))) + (let ((version "3.3.17")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vakata/jstree") + (commit version))) + (file-name (git-file-name "jstree" version)) + (sha256 + (base32 + "0njvqy16cwjvw8z4wvlgn3ibsg2d79g3fpj0sv3jxwz7mc3nhf2l")))))) (home-page "https://cran.r-project.org/package=ctrdata") (synopsis "Retrieve and analyze clinical trials in public registers") (description