From f23c89a25f8830a20378ae4e9e84aa5afdbe8ea3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Dec 2018 22:59:28 -0600 Subject: [PATCH 1/3] libedit: 20180525 -> 20181209 --- pkgs/development/libraries/libedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index c68e171084b9..602f5a78ccf2 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "libedit-20180525-3.1"; + name = "libedit-20181209-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4"; + sha256 = "0r0hc4lg71xnn0vrrk2g7is42i0k0dra7cbw3fljq3q01c6df498"; }; outputs = [ "out" "dev" ]; From 784a506d94272935859bcc8b1b51e05e57515243 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Mar 2019 18:38:26 -0500 Subject: [PATCH 2/3] libedit: 20181209 -> 20190324 --- pkgs/development/libraries/libedit/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 602f5a78ccf2..3e290e639991 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "libedit-20181209-3.1"; + pname = "libedit"; + version = "20190324-3.1"; src = fetchurl { - url = "https://thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "0r0hc4lg71xnn0vrrk2g7is42i0k0dra7cbw3fljq3q01c6df498"; + url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; + sha256 = "1bhvp8xkkgrg89k4ci1k8vjl3nhb6szd4ghy9lp4jrfgq58hz3xc"; }; outputs = [ "out" "dev" ]; From c9551505bc8e77b63051fe260050f9a27e0ee617 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 24 Mar 2019 20:01:42 -0500 Subject: [PATCH 3/3] libedit: No need to specify `--enable-widec` anymore --- pkgs/development/libraries/libedit/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 3e290e639991..e46a7ec33c4d 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses ]; - configureFlags = [ "--enable-widec" ]; - postInstall = '' find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g'