From e6661db29f05b4e18fb881b51c4a4d171318f56e Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Thu, 17 Aug 2017 10:19:08 +0200 Subject: [PATCH] ncurses: 6.0 -> 6.0-20170729 Bump version to include a patch that fixes #19785. --- pkgs/development/libraries/ncurses/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 827a556a4688..e2c3907e856a 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -9,19 +9,18 @@ , buildPlatform, hostPlatform , buildPackages }: -let - version = if abiVersion == "5" then "5.9" else "6.0"; - sha256 = if abiVersion == "5" - then "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh" - else "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm"; -in + stdenv.mkDerivation rec { + version = if abiVersion == "5" then "5.9" else "6.0-20170729"; name = "ncurses-${version}"; - src = fetchurl { + src = fetchurl (if abiVersion == "5" then { url = "mirror://gnu/ncurses/${name}.tar.gz"; - inherit sha256; - }; + sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; + } else { + url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz"; + sha256 = "1cfdpl2gnj8szw28jmzrw47va0yqn16g03ywyzz3bjmaqxxmmwga"; + }); patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch;