Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

merge #3428: nano: bump and add system-wide config

+40 -2
+1
nixos/modules/module-list.nix
··· 53 ./programs/dconf.nix 54 ./programs/environment.nix 55 ./programs/info.nix 56 ./programs/screen.nix 57 ./programs/shadow.nix 58 ./programs/shell.nix
··· 53 ./programs/dconf.nix 54 ./programs/environment.nix 55 ./programs/info.nix 56 + ./programs/nano.nix 57 ./programs/screen.nix 58 ./programs/shadow.nix 59 ./programs/shell.nix
+35
nixos/modules/programs/nano.nix
···
··· 1 + { config, lib, ... }: 2 + 3 + let 4 + cfg = config.programs.nano; 5 + in 6 + 7 + { 8 + ###### interface 9 + 10 + options = { 11 + programs.nano = { 12 + 13 + nanorc = lib.mkOption { 14 + type = lib.types.lines; 15 + default = ""; 16 + description = '' 17 + The system-wide nano configuration. 18 + See <citerefentry><refentrytitle>nanorc</refentrytitle><manvolnum>5</manvolnum></citerefentry>. 19 + ''; 20 + example = '' 21 + set nowrap 22 + set tabstospaces 23 + set tabsize 4 24 + ''; 25 + }; 26 + }; 27 + }; 28 + 29 + ###### implementation 30 + 31 + config = lib.mkIf (cfg.nanorc != "") { 32 + environment.etc."nanorc".text = cfg.nanorc; 33 + }; 34 + 35 + }
+4 -2
pkgs/applications/editors/nano/default.nix
··· 2 3 stdenv.mkDerivation (rec { 4 pname = "nano"; 5 - version = "2.3.2"; 6 7 name = "${pname}-${version}"; 8 9 src = fetchurl { 10 url = "mirror://gnu/nano/${name}.tar.gz"; 11 - sha256 = "1s3b21h5p7r8xafw0gahswj16ai6k2vnjhmd15b491hl0x494c7z"; 12 }; 13 14 buildInputs = [ ncurses gettext ]; 15 16 meta = { 17 homepage = http://www.nano-editor.org/;
··· 2 3 stdenv.mkDerivation (rec { 4 pname = "nano"; 5 + version = "2.3.6"; 6 7 name = "${pname}-${version}"; 8 9 src = fetchurl { 10 url = "mirror://gnu/nano/${name}.tar.gz"; 11 + sha256 = "a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534"; 12 }; 13 14 buildInputs = [ ncurses gettext ]; 15 + 16 + configureFlags = "sysconfdir=/etc"; 17 18 meta = { 19 homepage = http://www.nano-editor.org/;