From ce84ba5bd7f282c7164eeec4dd17ebccc94c60a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Jul 2021 13:20:08 +0200 Subject: [PATCH] gnu: r-vdiffr: Update to 1.0.2. * gnu/packages/cran.scm (r-vdiffr): Update to 1.0.2. [source]: Remove snippet. [arguments]: Remove. [inputs]: Remove freetype and harfbuzz; add libpng and zlib. [propagated-inputs]: Remove r-bh, r-devtools, r-fontquiver, r-freetypeharfbuzz, r-gdtools, r-htmlwidgets, r-purrr, r-r6, r-rcpp, r-shiny, and r-usethis; add r-cpp11 and r-lifecycle. [native-inputs]: Remove esbuild and js-jquery. --- gnu/packages/cran.scm | 45 ++++++------------------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7bdcb5e6b0..8f9dd7cb27 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28255,61 +28255,28 @@ unit tests of graphics).") (define-public r-vdiffr (package (name "r-vdiffr") - (version "0.3.3") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "vdiffr" version)) (sha256 (base32 - "0i0xdr8dakbkkgrhp0zvlnv3rxhc8h5naqq416mr5zv9q8i4p8jc")) - (snippet - '(begin - (delete-file "inst/htmlwidgets/lib/jquery.min.js"))))) + "1zjwjw8lqqnx7cxj2aik5rn1g67zsyf0bq08yfwwmsi7v2x6ly3x")))) (properties `((upstream-name . "vdiffr"))) (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'process-javascript - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "inst/htmlwidgets/lib/" - (let ((source (assoc-ref inputs "js-jquery")) - (target "jquery.min.js")) - (format #true "Processing ~a --> ~a~%" - source target) - (invoke "esbuild" source "--minify" - (string-append "--outfile=" target))))))))) (inputs - `(("freetype" ,freetype) - ("harfbuzz" ,harfbuzz))) + `(("libpng" ,libpng) + ("zlib" ,zlib))) (propagated-inputs - `(("r-bh" ,r-bh) - ("r-devtools" ,r-devtools) + `(("r-cpp11" ,r-cpp11) ("r-diffobj" ,r-diffobj) - ("r-fontquiver" ,r-fontquiver) - ("r-freetypeharfbuzz" ,r-freetypeharfbuzz) - ("r-gdtools" ,r-gdtools) ("r-glue" ,r-glue) ("r-htmltools" ,r-htmltools) - ("r-htmlwidgets" ,r-htmlwidgets) - ("r-purrr" ,r-purrr) - ("r-r6" ,r-r6) - ("r-rcpp" ,r-rcpp) + ("r-lifecycle" ,r-lifecycle) ("r-rlang" ,r-rlang) - ("r-shiny" ,r-shiny) ("r-testthat" ,r-testthat) - ("r-usethis" ,r-usethis) ("r-xml2" ,r-xml2))) - (native-inputs - `(("esbuild" ,esbuild) - ("js-jquery" - ,(origin - (method url-fetch) - (uri "https://code.jquery.com/jquery-1.12.4.js") - (sha256 - (base32 - "0x9mrc1668icvhpwzvgafm8xm11x9lfai9nwr66aw6pjnpwkc3s3")))))) (home-page "https://github.com/r-lib/vdiffr") (synopsis "Visual regression testing and graphical diffing") (description