gnu: r-bslib: Update to 0.3.0.

* gnu/packages/cran.scm (r-bslib): Update to 0.3.0.
[source]: Delete new minified JavaScript file.
[arguments]: Update minification code.
[native-inputs]: Update source file for Bootstrap 4; add source file for
Bootstrap 5.
[propagated-inputs]: Remove r-magrittr.
This commit is contained in:
Ricardo Wurmus 2021-09-29 12:36:13 +02:00
parent e370108436
commit 68fa5c6a6e
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -1929,20 +1929,21 @@ (define-public r-sass
(define-public r-bslib (define-public r-bslib
(package (package
(name "r-bslib") (name "r-bslib")
(version "0.2.5.1") (version "0.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "bslib" version)) (uri (cran-uri "bslib" version))
(sha256 (sha256
(base32 (base32
"16f8d7lp2bdq1vipr60l75gibgdq08hmx212dhrh66nwf7qglhky")) "0zfjavz5jw4lfbrmc3rgsivcrxq2ia9jwmfbcrdxnxlmyri8qinr"))
(snippet (snippet
'(for-each delete-file '(for-each delete-file
'("inst/lib/bs-a11y-p/plugins/js/bootstrap-accessibility.min.js" '("inst/lib/bs-a11y-p/plugins/js/bootstrap-accessibility.min.js"
"inst/lib/bs-colorpicker/js/bootstrap-colorpicker.min.js" "inst/lib/bs-colorpicker/js/bootstrap-colorpicker.min.js"
"inst/lib/bs-sass/assets/javascripts/bootstrap.min.js" "inst/lib/bs3/assets/javascripts/bootstrap.min.js"
"inst/lib/bs/dist/js/bootstrap.bundle.min.js"))))) "inst/lib/bs4/dist/js/bootstrap.bundle.min.js"
"inst/lib/bs5/dist/js/bootstrap.bundle.min.js")))))
(properties `((upstream-name . "bslib"))) (properties `((upstream-name . "bslib")))
(build-system r-build-system) (build-system r-build-system)
(arguments (arguments
@ -1961,10 +1962,12 @@ (define-public r-bslib
"bs-a11y-p/plugins/js/bootstrap-accessibility.min.js") "bs-a11y-p/plugins/js/bootstrap-accessibility.min.js")
("bs-colorpicker/js/bootstrap-colorpicker.js" ("bs-colorpicker/js/bootstrap-colorpicker.js"
"bs-colorpicker/js/bootstrap-colorpicker.min.js") "bs-colorpicker/js/bootstrap-colorpicker.min.js")
("bs-sass/assets/javascripts/bootstrap.js" ("bs3/assets/javascripts/bootstrap.js"
"bs-sass/assets/javascripts/bootstrap.min.js") "bs3/assets/javascripts/bootstrap.min.js")
(,(assoc-ref inputs "js-bootstrap-bundle") (,(assoc-ref inputs "js-bootstrap4-bundle")
"bs/dist/js/bootstrap.bundle.min.js")))) "bs4/dist/js/bootstrap.bundle.min.js")
(,(assoc-ref inputs "js-bootstrap5-bundle")
"bs5/dist/js/bootstrap.bundle.min.js"))))
(lambda (sources targets) (lambda (sources targets)
(for-each (lambda (source target) (for-each (lambda (source target)
(format #t "Processing ~a --> ~a~%" (format #t "Processing ~a --> ~a~%"
@ -1976,18 +1979,24 @@ (define-public r-bslib
`(("r-htmltools" ,r-htmltools) `(("r-htmltools" ,r-htmltools)
("r-jquerylib" ,r-jquerylib) ("r-jquerylib" ,r-jquerylib)
("r-jsonlite" ,r-jsonlite) ("r-jsonlite" ,r-jsonlite)
("r-magrittr" ,r-magrittr)
("r-rlang" ,r-rlang) ("r-rlang" ,r-rlang)
("r-sass" ,r-sass))) ("r-sass" ,r-sass)))
(native-inputs (native-inputs
`(("esbuild" ,esbuild) `(("esbuild" ,esbuild)
("js-bootstrap-bundle" ("js-bootstrap4-bundle"
,(origin ,(origin
(method url-fetch) (method url-fetch)
(uri "https://raw.githubusercontent.com/twbs/bootstrap/v4.5.3/dist/js/bootstrap.bundle.js") (uri "https://raw.githubusercontent.com/twbs/bootstrap/v4.6.0/dist/js/bootstrap.bundle.js")
(sha256 (sha256
(base32 (base32
"1lcsxj7gcm56va3gck47ggpwzjxrzq27sgjzdw6c54qkp0487sak")))))) "04abvgp923w36qfqkkl2syim3bl119nwxbgials90z1jyb8jgss1"))))
("js-bootstrap5-bundle"
,(origin
(method url-fetch)
(uri "https://raw.githubusercontent.com/twbs/bootstrap/v5.0.2/dist/js/bootstrap.bundle.js")
(sha256
(base32
"06vin94nqw1vzs4zrqcms8z9js9fckbj8gwyx07awm8jkjhnqfhl"))))))
(home-page "https://rstudio.github.io/bslib/") (home-page "https://rstudio.github.io/bslib/")
(synopsis "Custom Bootstrap Sass themes for shiny and rmarkdown") (synopsis "Custom Bootstrap Sass themes for shiny and rmarkdown")
(description (description