[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/174: gnu: r-bslib: Update to 0.5.0.
|
From: |
guix-commits |
|
Subject: |
02/174: gnu: r-bslib: Update to 0.5.0. |
|
Date: |
Wed, 12 Jul 2023 08:30:38 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 2680ec55ff23935a173d69863960b03962bbf2dd
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Jul 10 22:27:42 2023 +0200
gnu: r-bslib: Update to 0.5.0.
* gnu/packages/cran.scm (r-bslib): Update to 0.5.0.
[source]: Delete minified JavaScript for components.
[arguments]: Update 'process-javascript phase to generate components from
source.
[native-inputs]: Add typescript-components.
---
gnu/packages/cran.scm | 85 +++++++++++++++++++++++++++++++++------------------
1 file changed, 55 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 24b6c9fecc..ed5d23f11b 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -4058,51 +4058,66 @@ expression estimates for all genes.")
(define-public r-bslib
(package
(name "r-bslib")
- (version "0.4.2")
+ (version "0.5.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "bslib" version))
(sha256
(base32
- "069ghbzp0bsmbw2nzw28cmbym65i3a90v50y7qksy2g4pfhvfh4s"))
+ "05fi1cbb33hvrxx3vibbai7bzlx60jxd3iaqpc86x0224b3gpim2"))
(snippet
'(for-each delete-file
-
'("inst/lib/bs-a11y-p/plugins/js/bootstrap-accessibility.min.js"
+ '("inst/components/accordion.min.js"
+ "inst/components/card.min.js"
+ "inst/components/sidebar.min.js"
+
"inst/lib/bs-a11y-p/plugins/js/bootstrap-accessibility.min.js"
"inst/lib/bs3/assets/javascripts/bootstrap.min.js"
"inst/lib/bs4/dist/js/bootstrap.bundle.min.js"
"inst/lib/bs5/dist/js/bootstrap.bundle.min.js")))))
(properties `((upstream-name . "bslib")))
(build-system r-build-system)
(arguments
- `(#:modules ((guix build utils)
+ (list
+ #:modules '((guix build utils)
(guix build r-build-system)
(srfi srfi-1))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'process-javascript
- (lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion "inst/lib/"
- (call-with-values
- (lambda ()
- (unzip2
- `(("bs-a11y-p/plugins/js/bootstrap-accessibility.js"
- "bs-a11y-p/plugins/js/bootstrap-accessibility.min.js")
- ("bs-colorpicker/js/bootstrap-colorpicker.js"
- "bs-colorpicker/js/bootstrap-colorpicker.min.js")
- ("bs3/assets/javascripts/bootstrap.js"
- "bs3/assets/javascripts/bootstrap.min.js")
- (,(assoc-ref inputs "js-bootstrap4-bundle")
- "bs4/dist/js/bootstrap.bundle.min.js")
- (,(assoc-ref inputs "js-bootstrap5-bundle")
- "bs5/dist/js/bootstrap.bundle.min.js"))))
- (lambda (sources targets)
- (for-each (lambda (source target)
- (format #t "Processing ~a --> ~a~%"
- source target)
- (invoke "esbuild" source "--minify"
- (string-append "--outfile=" target)))
- sources targets)))))))))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'process-javascript
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; See srcts/build/index.ts
+ (for-each (lambda (component)
+ (invoke "esbuild"
+ "--bundle" "--minify" "--sourcemap"
+ "--target=es6" ;"--external=:bootstrap"
+ (string-append
+ #$(this-package-native-input
"typescript-components")
+ "/srcts/src/components/" component ".ts")
+ (string-append "--outfile=inst/components/"
+ component ".min.js")))
+ '("accordion" "sidebar" "card"))
+ (with-directory-excursion "inst/lib/"
+ (call-with-values
+ (lambda ()
+ (unzip2
+ `(("bs-a11y-p/plugins/js/bootstrap-accessibility.js"
+
"bs-a11y-p/plugins/js/bootstrap-accessibility.min.js")
+ ("bs-colorpicker/js/bootstrap-colorpicker.js"
+ "bs-colorpicker/js/bootstrap-colorpicker.min.js")
+ ("bs3/assets/javascripts/bootstrap.js"
+ "bs3/assets/javascripts/bootstrap.min.js")
+ (,(assoc-ref inputs "js-bootstrap4-bundle")
+ "bs4/dist/js/bootstrap.bundle.min.js")
+ (,(assoc-ref inputs "js-bootstrap5-bundle")
+ "bs5/dist/js/bootstrap.bundle.min.js"))))
+ (lambda (sources targets)
+ (for-each (lambda (source target)
+ (format #t "Processing ~a --> ~a~%"
+ source target)
+ (invoke "esbuild" source "--minify"
+ (string-append "--outfile=" target)))
+ sources targets)))))))))
(propagated-inputs
(list r-base64enc
r-cachem
@@ -4128,7 +4143,17 @@ expression estimates for all genes.")
(uri
"https://raw.githubusercontent.com/twbs/bootstrap/v5.2.2/dist/js/bootstrap.bundle.js";)
(sha256
(base32
- "1ibfb1lwwm50did0b4fvxaqc7xyljmp20f3qb1ybdlvcy22mk8bg"))))))
+ "1ibfb1lwwm50did0b4fvxaqc7xyljmp20f3qb1ybdlvcy22mk8bg"))))
+ ("typescript-components"
+ ,(origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rstudio/bslib";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1krmavvbnpikiyxgv36vf70p8qzy1rymh1l41pjc7z74hk526p7c"))))))
(home-page "https://rstudio.github.io/bslib/";)
(synopsis "Custom Bootstrap Sass themes for shiny and rmarkdown")
(description
- branch master updated (4a027d2b0e -> f2f27c4952), guix-commits, 2023/07/12
- 05/174: gnu: r-plotly: Update to 4.10.2., guix-commits, 2023/07/12
- 02/174: gnu: r-bslib: Update to 0.5.0.,
guix-commits <=
- 01/174: refresh: Sort update specs by package location., guix-commits, 2023/07/12
- 08/174: gnu: r-lme4: Update to 1.1-34., guix-commits, 2023/07/12
- 10/174: gnu: r-gprofiler2: Update to 0.2.2., guix-commits, 2023/07/12
- 09/174: gnu: r-v8: Update to 4.3.2., guix-commits, 2023/07/12
- 12/174: gnu: r-gmp: Update to 0.7-2., guix-commits, 2023/07/12
- 04/174: gnu: r-opencpu: Update to 2.2.10., guix-commits, 2023/07/12
- 14/174: gnu: r-leidenalg: Update to 1.1.0., guix-commits, 2023/07/12
- 03/174: gnu: r-rgl: Update to 1.2.1., guix-commits, 2023/07/12
- 06/174: import/cran: Add one more package name transformation., guix-commits, 2023/07/12
- 07/174: gnu: r-digest: Update to 0.6.33., guix-commits, 2023/07/12