Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8c853e668298
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 261bf90fb965
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 5, 2018

  1. ncurses: upgrade from 6.1 -> 6.1-20181027 

    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)
    @andrew-d @guaraqe
    andrew-d authored and guaraqe committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0b2757d View commit details

  2. Merge pull request #51181 from guaraqe/ncurses 

    ncurses: upgrade from 6.1 -> 6.1-20181027
    @c0bw3b
    c0bw3b authored Dec 5, 2018
    Copy the full SHA
    261bf90 View commit details
Showing with 8 additions and 19 deletions.
  1. +8 −6 pkgs/development/libraries/ncurses/default.nix
  2. +0 −13 pkgs/development/libraries/ncurses/st-0.7.patch
14 changes: 8 additions & 6 deletions pkgs/development/libraries/ncurses/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
@@ -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"
13 changes: 0 additions & 13 deletions pkgs/development/libraries/ncurses/st-0.7.patch
View file

This file was deleted.