aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/ncurses.scm11
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index 311a681d09..5b00da25bb 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -247,6 +247,17 @@ ncursesw library provides wide character support.")
(inputs
`(("gpm" ,gpm)))))
+;; Needed by u-boot 2022.04+
+;; Consider merging into ncurses for next core-updates cycle.
+(define-public ncurses/tinfo
+ (package/inherit ncurses
+ (name "ncurses-with-tinfo")
+ (arguments
+ (substitute-keyword-arguments (package-arguments ncurses)
+ ((#:configure-flags cf)
+ `(cons "--with-termlib=tinfo"
+ ,cf))))))
+
(define-public dialog
(package
(name "dialog")
changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 9ef9ac1a76..cb2e0e8bcd 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -20987,18 +20987,24 @@ to easily call your own custom JavaScript functions from R.")
(define-public r-colourpicker
(package
(name "r-colourpicker")
- (version "1.2.0")
+ (version "1.3.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "colourpicker" version))
(sha256
(base32
- "12k3m2s49pc1p2hzd4zqqzzdf94q7hhqz7zgp8w908a6w3p80b5w"))))
+ "0415238r7a8xrp3kvq8lczzxz534irj2q1zfbb0pl7xfs6663wn7"))
+ (snippet
+ '(for-each delete-file
+ (list "inst/examples/colourInput/www/salvattore.min.js"
+ "inst/htmlwidgets/lib/jquery/jquery.min.js"
+ "inst/www/shared/colourpicker/js/colourpicker.min.js")))))
(build-system r-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
+ (list
+ #:phases
+ '(modify-phases %standard-phases
(add-after 'unpack 'process-javascript
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "inst"
@@ -21012,7 +21018,6 @@ to easily call your own custom JavaScript functions from R.")
(for-each (lambda (source target)
(format #true "Processing ~a --> ~a~%"
source target)
- (delete-file target)
(invoke "esbuild" source "--minify"
(string-append "--outfile=" target)))
(map car mapping)