public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42410 from Ma27/improve-screen-module

Browse Source 
nixos/screen: add `pkgs.screen` to the system closure
This commit is contained in:
Frederik Rietdijk 2018-06-23 18:12:37 +02:00 committed by GitHub
commit 904114fdb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-1809.xml
View File

@ -322,6 +322,14 @@ inherit (pkgs.nixos {
<literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal> <literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal>
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <varname>programs.screen</varname> module provides allows to configure
<literal>/etc/screenrc</literal>, however the module behaved fairly counterintuitive as
the config exists, but the package wasn't available. Since 18.09 <literal>pkgs.screen</literal>
will be added to <literal>environment.systemPackages</literal>.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

4
nixos/modules/programs/screen.nix
View File

@ -1,4 +1,4 @@
{ config, lib, ... }: { config, lib, pkgs, ... }:
let let
inherit (lib) mkOption mkIf types; inherit (lib) mkOption mkIf types;
@ -25,6 +25,8 @@ in
config = mkIf (cfg.screenrc != "") { config = mkIf (cfg.screenrc != "") {
environment.etc."screenrc".text = cfg.screenrc; environment.etc."screenrc".text = cfg.screenrc;
environment.systemPackages = [ pkgs.screen ];
}; };
} }