From b6116539be2c0dd9d9ca86d66a294916760fa454 Mon Sep 17 00:00:00 2001 From: Miguel Madrid Date: Fri, 2 Sep 2016 23:26:02 +0200 Subject: [PATCH] nano: 2.6.3 -> 2.7.0 (#18201) --- pkgs/applications/editors/nano/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index f99e5d76a473..c380d05302ed 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -12,10 +12,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.6.3"; + version = "2.7.0"; src = fetchurl { - url = "https://nano-editor.org/dist/v2.6/${name}.tar.gz"; - sha256 = "00ym3zws1vdds726drgr5wj14mjn18d96ghn6vjci0915zhm8h2g"; + url = "mirror://gnu/nano/${name}.tar.xz"; + sha256 = "08cmnca3s377z74yjw1afz59l2h9s40wsa9wxw5y4x5f2jaz6spq"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; @@ -26,15 +26,6 @@ stdenv.mkDerivation rec { ${optionalString enableTiny "--enable-tiny"} ''; - patchFlags = [ "-p0" ]; - - patches = optional stdenv.isDarwin - (fetchurl { - name = "darwin.patch"; - url = "https://trac.macports.org/browser/trunk/dports/editors/nano/files/patch-src-winio.c.diff?rev=151356&format=txt"; - sha256 = "184q33irz9px2svwr2qx70zvfby5zlwlhv4k607yzsy90fq2jpdd"; - }); - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/text.c --replace "__time_t" "time_t" '';