diff options
author | Will Dietz <github@wdtz.org> | 2018-02-23 10:29:59 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-23 10:29:59 -0600 |
commit | 19784ca4c9ac378539bdc535b02ae673ba6ba0b0 (patch) | |
tree | 0dd33eb9c9f54c5e231fa9a0a2ddaab370189eb1 | |
parent | b42b1c8f2275011bb890bde1cea2c1796ea95c61 (diff) | |
parent | be6e6d2e0481a819648e1caf970c152822aebd20 (diff) | |
download | nixpkgs-19784ca4c9ac378539bdc535b02ae673ba6ba0b0.tar nixpkgs-19784ca4c9ac378539bdc535b02ae673ba6ba0b0.tar.gz nixpkgs-19784ca4c9ac378539bdc535b02ae673ba6ba0b0.tar.bz2 nixpkgs-19784ca4c9ac378539bdc535b02ae673ba6ba0b0.tar.lz nixpkgs-19784ca4c9ac378539bdc535b02ae673ba6ba0b0.tar.xz nixpkgs-19784ca4c9ac378539bdc535b02ae673ba6ba0b0.tar.zst nixpkgs-19784ca4c9ac378539bdc535b02ae673ba6ba0b0.zip |
Merge pull request #34477 from dtzWill/update/ncurses-6.1
ncurses6: 20171125 -> 6.1
-rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index d63536e75f0..1524b265999 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/ncurses-${version}.tar.gz"; + sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da"; }; patches = lib.optional (!stdenv.cc.isClang) ./clang.patch; @@ -123,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) '' |