From e642a66b11cebf618aac997ee8dcfa254f820b4f Mon Sep 17 00:00:00 2001 From: nick black Date: Tue, 19 Jan 2021 04:35:51 -0500 Subject: [PATCH] notcurses: 2.1.0 -> 2.1.5 Signed-off-by: William Casarin --- pkgs/development/libraries/notcurses/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index 7b9bffb9bc9..09169019a12 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -1,9 +1,9 @@ -{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, +{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, readline, fetchFromGitHub, lib, multimediaSupport ? true }: let - version = "2.1.0"; + version = "2.1.5"; in stdenv.mkDerivation { pname = "notcurses"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config pandoc ]; - buildInputs = [ libunistring ncurses ] + buildInputs = [ libunistring ncurses readline ] ++ lib.optional multimediaSupport ffmpeg; cmakeFlags = @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "0jvngg40c1sqf85kqy6ya0vflpxsj7j4g6cw609992rifaghxiny"; + sha256 = "02x9a0z7mbgry2wsfai1l3jwb2zpcg4gq6a2w5d920ap2fixzy8b"; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bddee22659..bb3a3b50d1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15665,7 +15665,9 @@ in notify-sharp = callPackage ../development/libraries/notify-sharp { }; - notcurses = callPackage ../development/libraries/notcurses { }; + notcurses = callPackage ../development/libraries/notcurses { + readline = readline80; + }; ncurses5 = ncurses.override { abiVersion = "5"; -- 2.28.0