diff options
author | William A. Kennington III <william@wkennington.com> | 2015-03-25 21:47:44 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-03-25 21:47:44 -0700 |
commit | 247cf8f37a7ef960db94a04f6942df1ba6e492f6 (patch) | |
tree | 349b072f907f8574081bd9a68c6b44bbe8ee811f /pkgs/applications | |
parent | bb70b19394bc9a0e6c7f3f5864bd86e9e20be93d (diff) | |
parent | cf74e83057999ef669b79aea687d5c28bf4e445a (diff) | |
download | nixlib-247cf8f37a7ef960db94a04f6942df1ba6e492f6.tar nixlib-247cf8f37a7ef960db94a04f6942df1ba6e492f6.tar.gz nixlib-247cf8f37a7ef960db94a04f6942df1ba6e492f6.tar.bz2 nixlib-247cf8f37a7ef960db94a04f6942df1ba6e492f6.tar.lz nixlib-247cf8f37a7ef960db94a04f6942df1ba6e492f6.tar.xz nixlib-247cf8f37a7ef960db94a04f6942df1ba6e492f6.tar.zst nixlib-247cf8f37a7ef960db94a04f6942df1ba6e492f6.zip |
Merge pull request #6986 from joachifm/nano-2_4
Nano 2.4
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/nano/default.nix | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index caea8758d958..84c1a79591bc 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,22 +1,33 @@ -{ stdenv, fetchurl, ncurses, gettext }: +{ stdenv, fetchurl +, ncurses +, gettext ? null +, enableNls ? false +, enableTiny ? false +}: -stdenv.mkDerivation (rec { - pname = "nano"; - version = "2.3.6"; +assert enableNls -> (gettext != null); - name = "${pname}-${version}"; +with stdenv.lib; +stdenv.mkDerivation rec { + name = "nano-${version}"; + version = "2.4.0"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534"; + sha256 = "1gbm9bcv4k55y01r5q8a8a9s3yrrgq3z5jxxiij3wl404r8gnxjh"; }; - - buildInputs = [ ncurses gettext ]; - - configureFlags = "sysconfdir=/etc"; + buildInputs = [ ncurses ] ++ optional enableNls gettext; + configureFlags = '' + --sysconfdir=/etc + ${optionalString (!enableNls) "--disable-nls"} + ${optionalString enableTiny "--enable-tiny"} + ''; meta = { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ joachifm ]; + platforms = platforms.all; }; -}) +} |