Merge pull request #34477 from dtzWill/update/ncurses-6.1
ncurses6: 20171125 -> 6.1
This commit is contained in:
commit
19784ca4c9
@ -11,18 +11,12 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "6.0-20171125";
|
version = "6.1";
|
||||||
name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";
|
name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [
|
url = "mirror://gnu/ncurses/ncurses-${version}.tar.gz";
|
||||||
# Remove this mirror on next upgrade, it's only needed because upstream took ncurses-6.0-20171125.tgz down!
|
sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da";
|
||||||
"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";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;
|
patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;
|
||||||
@ -123,6 +117,8 @@ stdenv.mkDerivation rec {
|
|||||||
moveToOutput "bin/tic" "$out"
|
moveToOutput "bin/tic" "$out"
|
||||||
moveToOutput "bin/tput" "$out"
|
moveToOutput "bin/tput" "$out"
|
||||||
moveToOutput "bin/tset" "$out"
|
moveToOutput "bin/tset" "$out"
|
||||||
|
moveToOutput "bin/captoinfo" "$out"
|
||||||
|
moveToOutput "bin/infotocap" "$out"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preFixup = lib.optionalString (!hostPlatform.isCygwin) ''
|
preFixup = lib.optionalString (!hostPlatform.isCygwin) ''
|
||||||
|
Loading…
Reference in New Issue
Block a user