gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ncurses: 6.5 -> 6.6 (#477454)

Browse Source
This commit is contained in:
Philip Taron
2026-01-06 18:50:04 +00:00
committed by GitHub
parent 02cebb4644 9e4a546ad1
commit 036dd9bb3a
2 changed files with 2 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/ncurses/1001-ncurses-Support-gnuabielfv1-2.patch
-72
View File
@@ -1,72 +0,0 @@
diff '--color=auto' -ruN a/aclocal.m4 b/aclocal.m4
--- a/aclocal.m4 2025-07-19 18:19:51.000000000 +0200
+++ b/aclocal.m4 2025-07-25 14:11:19.900876172 +0200
@@ -10290,7 +10290,7 @@
cf_xopen_source="-D_SGI_SOURCE"
cf_XOPEN_SOURCE=
;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
CF_GNU_SOURCE($cf_XOPEN_SOURCE)
;;
linux*musl)
diff '--color=auto' -ruN a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
--- a/Ada95/aclocal.m4 2025-07-19 18:38:31.000000000 +0200
+++ b/Ada95/aclocal.m4 2025-07-25 14:11:57.495783459 +0200
@@ -5430,7 +5430,7 @@
cf_xopen_source="-D_SGI_SOURCE"
cf_XOPEN_SOURCE=
;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
CF_GNU_SOURCE($cf_XOPEN_SOURCE)
;;
linux*musl)
diff '--color=auto' -ruN a/Ada95/configure b/Ada95/configure
--- a/Ada95/configure 2025-07-19 18:40:05.000000000 +0200
+++ b/Ada95/configure 2025-07-25 14:11:49.981449762 +0200
@@ -13955,7 +13955,7 @@
cf_xopen_source="-D_SGI_SOURCE"
cf_XOPEN_SOURCE=
;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
cf_gnu_xopen_source=$cf_XOPEN_SOURCE
diff '--color=auto' -ruN a/configure b/configure
--- a/configure 2025-07-19 19:00:40.000000000 +0200
+++ b/configure 2025-07-25 14:11:02.884551699 +0200
@@ -10737,7 +10737,7 @@
cf_xopen_source="-D_SGI_SOURCE"
cf_XOPEN_SOURCE=
;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
cf_gnu_xopen_source=$cf_XOPEN_SOURCE
diff '--color=auto' -ruN a/test/aclocal.m4 b/test/aclocal.m4
--- a/test/aclocal.m4 2025-07-19 18:42:37.000000000 +0200
+++ b/test/aclocal.m4 2025-07-25 14:11:41.551475534 +0200
@@ -4658,7 +4658,7 @@
cf_xopen_source="-D_SGI_SOURCE"
cf_XOPEN_SOURCE=
;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
CF_GNU_SOURCE($cf_XOPEN_SOURCE)
;;
linux*musl)
diff '--color=auto' -ruN a/test/configure b/test/configure
--- a/test/configure 2025-06-14 15:40:22.000000000 +0200
+++ b/test/configure 2025-07-25 14:11:34.529155110 +0200
@@ -4183,7 +4183,7 @@
cf_xopen_source="-D_SGI_SOURCE"
cf_XOPEN_SOURCE=
;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnuabielfv*|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
cf_gnu_xopen_source=$cf_XOPEN_SOURCE
pkgs/development/libraries/ncurses/default.nix
+2 -10
View File
@@ -18,12 +18,12 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "6.5";
version = "6.6";
pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat";
src = fetchurl {
url = "https://invisible-island.net/archives/ncurses/ncurses-${finalAttrs.version}.tar.gz";
hash = "sha256-E22RvCaamleF5fnpgLx2q1dCj2BM4+WlqQzrx2eXHMY=";
hash = "sha256-NVtMu+2ICwOBoExGYXt2VuNiWF1S6c+Epn4gCbdJ/xE=";
};
outputs = [
@@ -34,14 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
setOutputFlags = false; # some aren't supported
separateDebugInfo = false;
patches = [
# linux-gnuabielfv{1,2} is not in ncurses' list of GNU-ish targets (or smth like that?).
# Causes some defines (_XOPEN_SOURCE=600, _DEFAULT_SOURCE) to not get set, so wcwidth is not exposed by system headers, which causes a FTBFS.
# Reported and fix submitted to upstream in https://lists.gnu.org/archive/html/bug-ncurses/2025-07/msg00040.html
# Backported to the 6.5 release (dropped some hunks for code that isn't in this release yet)
./1001-ncurses-Support-gnuabielfv1-2.patch
];
postPatch = ''
sed -i '1i #include <stdbool.h>' include/curses.h.in
'';