From edf201583d6d2facefe8f98171957d83b77c093c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 20 Feb 2018 14:21:04 -0600 Subject: [PATCH 1/2] ncurses6: 20171125 -> 6.1 From my experience on slightly older tree, a few *old* programs incorrectly rely on ncurses internal details and may now require setting NCURSES_INTERNALS=1 to allow this badness. Since this is release, we can grab it from gnu mirrors. --- pkgs/development/libraries/ncurses/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index d63536e75f0..9ccdb48916a 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,18 +11,12 @@ }: stdenv.mkDerivation rec { - version = "6.0-20171125"; + version = "6.1"; name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - urls = [ - # Remove this mirror on next upgrade, it's only needed because upstream took ncurses-6.0-20171125.tgz down! - "http://bld1.alpinelinux.org/distfiles/v3.5/ncurses-${version}.tgz" - - "ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz" - "https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz" - ]; - sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; + url = "mirror://gnu/ncurses/${name}.tar.gz"; + sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da"; }; patches = lib.optional (!stdenv.cc.isClang) ./clang.patch; From be6e6d2e0481a819648e1caf970c152822aebd20 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 20 Feb 2018 14:30:20 -0600 Subject: [PATCH 2/2] ncurses 6.1: fix URL, accomodate captoinfo/infotocap along with tic --- pkgs/development/libraries/ncurses/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 9ccdb48916a..1524b265999 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "mirror://gnu/ncurses/${name}.tar.gz"; + url = "mirror://gnu/ncurses/ncurses-${version}.tar.gz"; sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da"; }; @@ -117,6 +117,8 @@ stdenv.mkDerivation rec { moveToOutput "bin/tic" "$out" moveToOutput "bin/tput" "$out" moveToOutput "bin/tset" "$out" + moveToOutput "bin/captoinfo" "$out" + moveToOutput "bin/infotocap" "$out" ''; preFixup = lib.optionalString (!hostPlatform.isCygwin) ''