git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #97565 from samuelgrf/defaultPackages-nano

nixos/config: move nano to defaultPackages

commitfe3eb35133e8c8da60f1d98fc4ee6d351e65f451 authordavidak <davidak@users.noreply.github.com> dateWed 31 Mar 2021, 09:17 (6 years ago) parent6cd0a4be6cd793
2 files changed+23−6
nixos/doc/manual/release-notes/rl-2105.xml+9 nixos/modules/config/system-path.nix+14−6
nixos/doc/manual/release-notes/rl-2105.xml+9
@@ -625,6 +625,15 @@ environment.systemPackages = [
625625 </programlisting>
626626 </para>
627627 </listitem>
628+ <listitem>
629+ <para>
630+ <option>environment.defaultPackages</option> now includes the nano package.
631+ If <package>pkgs.nano</package> is not added to the list,
632+ make sure another editor is installed and the <literal>EDITOR</literal>
633+ environment variable is set to it.
634+ Environment variables can be set using <option>environment.variables</option>.
635+ </para>
636+ </listitem>
628637 </itemizedlist>
629638 </section>
630639
nixos/modules/config/system-path.nix+14−6
@@ -29,7 +29,6 @@ let
2929 pkgs.xz
3030 pkgs.less
3131 pkgs.libcap
32− pkgs.nano
3332 pkgs.ncurses
3433 pkgs.netcat
3534 config.programs.ssh.package
@@ -43,7 +42,8 @@ let
4342 ];
4443
4544 defaultPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
46− [ pkgs.perl
45+ [ pkgs.nano
46+ pkgs.perl
4747 pkgs.rsync
4848 pkgs.strace
4949 ];
@@ -75,13 +75,21 @@ in
7575 default = defaultPackages;
7676 example = literalExample "[]";
7777 description = ''
78− Set of packages users expect from a minimal linux istall.
79− Like systemPackages, they appear in
80− /run/current-system/sw. These packages are
78+ Set of default packages that aren't strictly neccessary
79+ for a running system, entries can be removed for a more
80+ minimal NixOS installation.
81+
82+ Note: If <package>pkgs.nano</package> is removed from this list,
83+ make sure another editor is installed and the
84+ <literal>EDITOR</literal> environment variable is set to it.
85+ Environment variables can be set using
86+ <option>environment.variables</option>.
87+
88+ Like with systemPackages, packages are installed to
89+ <filename>/run/current-system/sw</filename>. They are
8190 automatically available to all users, and are
8291 automatically updated every time you rebuild the system
8392 configuration.
84− If you want a more minimal system, set it to an empty list.
8593 '';
8694 };
8795