Skip to content

Commit

Permalink
ncurses: upgrade from 6.1 -> 6.1-20181027
Browse files Browse the repository at this point in the history
This includes fixes for CVE-2018-10754.

While we're changing things, also set the `--with-manpage-format=normal`
configure flag, which prevents the `configure` script from looking in
/usr to determine whether to compress manpages. This was already the
format on NixOS (where these directories don't exist), but making this
explicit makes the build more reproducible on other distros.

(cherry picked from commit f485b2e)
  • Loading branch information
andrew-d authored and guaraqe committed Dec 5, 2018
1 parent 8c853e6 commit 0b2757d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
14 changes: 8 additions & 6 deletions pkgs/development/libraries/ncurses/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@
}:

stdenv.mkDerivation rec {
version = "6.1";
version = "6.1-20181027";
name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";

src = fetchurl {
url = "mirror://gnu/ncurses/ncurses-${version}.tar.gz";
sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da";
urls = [
"https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz"
"ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz"
];
sha256 = "1xn6wpi22jc61158w4ifq6s1fvilhmsy1in2srn3plk8pm0d4902";
};

# The patch st-0.7.patch needs to be removed, if ncurses is upgraded in the future.
# It is necessary for the 6.1 version of ncurses.
patches = [ ./st-0.7.patch ] ++ lib.optional (!stdenv.cc.isClang) ./clang.patch;
patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;

outputs = [ "out" "dev" "man" ];
setOutputFlags = false; # some aren't supported
Expand All @@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
"--without-debug"
"--enable-pc-files"
"--enable-symlinks"
"--with-manpage-format=normal"
] ++ lib.optional unicode "--enable-widec"
++ lib.optional (!withCxx) "--without-cxx"
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
Expand Down
13 changes: 0 additions & 13 deletions pkgs/development/libraries/ncurses/st-0.7.patch

This file was deleted.

0 comments on commit 0b2757d

Please sign in to comment.