guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit bb60c654ea485c4d1f78852be677671bca6e8881 Author: Vagrant Cascadian <[email protected]> AuthorDate: Fri May 15 22:39:50 2026 -0700 gnu: ncurses: Add tinfo support. * gnu/packages/ncurses.scm (ncurses)[#:configure-flags]: Add --with-termlib=tinfo. (ncurses/tinfo): Mark as deprecated package. * gnu/packages/bootloaders.scm (u-boot, u-boot-tools)[inputs]: Switch from ncurses/tinfo to ncurses. * gnu/packages/engineering.scm (minicom)[inputs]: Likewise. * gnu/packages/file-systems.scm (snapper)[inputs]: Likewise. * gnu/packages/music.scm (musikcube)[inputs]: Likewise. * gnu/packages/telephony.scm (sipp)[inputs]: Likewise. * gnu/packages/haskell.scm (binary-ghc-8.10.7)[inputs]: Likewise. [phases]: Update 'add-rpaths phase to use ncurses. --- gnu/packages/bootloaders.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/file-systems.scm | 2 +- gnu/packages/haskell.scm | 4 ++-- gnu/packages/music.scm | 2 +- gnu/packages/ncurses.scm | 13 +++---------- gnu/packages/telephony.scm | 2 +- 7 files changed, 11 insertions(+), 18 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e6e8f867e5..8a2952c6cd 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -894,7 +894,7 @@ tree binary files. These are board description files used by Linux and BSD.") gnutls flex lz4 - ncurses/tinfo + ncurses perl pkg-config ;for 'make menuconfig' python @@ -962,7 +962,7 @@ Info manual."))) (modify-inputs native-inputs (prepend python-filelock python-pycryptodomex)))) - (inputs (list gnutls ncurses/tinfo)) + (inputs (list gnutls ncurses)) (arguments `(#:make-flags '("HOSTCC=gcc" ,@(if (%current-target-system) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ec67f1b19c..c0a40ae107 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1262,7 +1262,7 @@ specified in rfc2217 and a (Linux specific) CAN mode.") (native-inputs (list autoconf-2.71 automake gettext-minimal pkg-config)) (inputs - (list ncurses/tinfo)) + (list ncurses)) (home-page "https://salsa.debian.org/minicom-team/minicom";) (synopsis "Serial terminal emulator") (description "@code{minicom} is a serial terminal emulator.") diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index b46af2f1bd..2dbaac1394 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1496,7 +1496,7 @@ APFS.") json-c acl boost-1.83 - ncurses/tinfo + ncurses libxslt docbook-xsl gettext-minimal)) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 1506bbe760..481e0924dc 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1521,7 +1521,7 @@ interactive environment for the functional language Haskell.") (supported-systems '("aarch64-linux")) ;; We need llvm until 9.2 which introduce aarch64 native code generation. ;; Make sure you have installed LLVM between [9 and 13) - (inputs (list gcc-13 gmp llvm-12 ncurses/tinfo numactl)) + (inputs (list gcc-13 gmp llvm-12 ncurses numactl)) (native-inputs (list patchelf perl)) (arguments @@ -1568,7 +1568,7 @@ interactive environment for the functional language Haskell.") (invoke "patchelf" "--add-rpath" (string-append #$gmp "/lib") b) (invoke "patchelf" "--add-rpath" - (string-append (assoc-ref inputs "ncurses-with-tinfo") "/lib") b) + (string-append (assoc-ref inputs "ncurses") "/lib") b) (invoke "patchelf" "--add-rpath" (string-append #$gcc-13:lib "/lib") b) (invoke "patchelf" "--add-rpath" diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 13bd53e722..4c1f1c7e58 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -7869,7 +7869,7 @@ choice.") libogg libopenmpt libvorbis - ncurses/tinfo + ncurses openssl pipewire pulseaudio diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 2ece203f15..b4ab4d3f0c 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -150,7 +150,7 @@ '("curses" "ncurses" "form" "panel" "menu"))))))) (list #:configure-flags #~`("--with-shared" "--without-debug" "--enable-widec" - + "--with-termlib=tinfo" "--enable-pc-files" ,(string-append "--with-pkg-config-libdir=" #$output "/lib/pkgconfig") @@ -217,15 +217,8 @@ ncursesw library provides wide character support.") #$cf)))) (inputs (list 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 arguments - ((#:configure-flags cf) - #~(cons "--with-termlib=tinfo" #$cf)))))) +(define-deprecated-package ncurses/tinfo + ncurses) (define-public cdk (package diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 8acac0ad85..3c35db77b0 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -1164,7 +1164,7 @@ It supports the following smartphones: (when tests? (invoke "./sipp_unittest"))))))) (inputs - (list gsl libpcap lksctp-tools ncurses/tinfo openssl)) + (list gsl libpcap lksctp-tools ncurses openssl)) (native-inputs (list googletest-1.8 pkg-config)) (synopsis "Performance testing tool for the SIP protocol")
