git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67585 from worldofpeace/system-config-printer

nixos/system-config-printer: init

commit5d4890b58dcbe0a099cda233a259284a6e5ec9d4 authorworldofpeace <worldofpeace@protonmail.ch> dateFri 6 Sep 2019, 12:08 (7 years ago) parent22c5054998f59c
10 files changed+110−9
nixos/doc/manual/release-notes/rl-1909.xml+26 nixos/modules/module-list.nix+2 nixos/modules/programs/system-config-printer.nix+32 nixos/modules/services/desktops/system-config-printer.nix+38 nixos/modules/services/x11/desktop-managers/gnome3.nix+1−2 nixos/modules/services/x11/desktop-managers/mate.nix+3 nixos/modules/services/x11/desktop-managers/pantheon.nix+3−3 nixos/modules/services/x11/desktop-managers/plasma5.nix+1−2 nixos/modules/services/x11/desktop-managers/xfce4-14.nix+1−2 pkgs/tools/misc/system-config-printer/default.nix+3
nixos/doc/manual/release-notes/rl-1909.xml+26
@@ -144,6 +144,32 @@
144144 but will make sure that the given printers are configured as declared.
145145 </para>
146146 </listitem>
147+ <listitem>
148+ <para>
149+ There is a new <xref linkend="opt-services.system-config-printer.enable"/> and <xref linkend="opt-programs.system-config-printer.enable"/> module
150+ for the program of the same name. If you previously had <literal>system-config-printer</literal> enabled through some other
151+ means you should migrate to using one of these modules.
152+ </para>
153+ <itemizedlist>
154+ <para>If you're a user of the following desktopManager modules no action is needed:</para>
155+ <listitem>
156+ <para><option>services.xserver.desktopManager.plasma5</option></para>
157+ </listitem>
158+ <listitem>
159+ <para><option>services.xserver.desktopManager.gnome3</option></para>
160+ </listitem>
161+ <listitem>
162+ <para><option>services.xserver.desktopManager.pantheon</option></para>
163+ </listitem>
164+ <listitem>
165+ <para><option>services.xserver.desktopManager.mate</option></para>
166+ <para>
167+ Note Mate uses <literal>programs.system-config-printer</literal> as it doesn't
168+ use it as a service, but its graphical interface directly.
169+ </para>
170+ </listitem>
171+ </itemizedlist>
172+ </listitem>
147173 </itemizedlist>
148174
149175 </section>
nixos/modules/module-list.nix+2
@@ -151,6 +151,7 @@
151151 ./programs/sysdig.nix
152152 ./programs/systemtap.nix
153153 ./programs/sway.nix
154+ ./programs/system-config-printer.nix
154155 ./programs/thefuck.nix
155156 ./programs/tmux.nix
156157 ./programs/tsm-client.nix
@@ -309,6 +310,7 @@
309310 ./services/desktops/gnome3/tracker.nix
310311 ./services/desktops/gnome3/tracker-miners.nix
311312 ./services/desktops/profile-sync-daemon.nix
313+ ./services/desktops/system-config-printer.nix
312314 ./services/desktops/telepathy.nix
313315 ./services/desktops/tumbler.nix
314316 ./services/desktops/zeitgeist.nix
nixos/modules/programs/system-config-printer.nixnew file+32
@@ -0,0 +1,32 @@
1+{ config, pkgs, lib, ... }:
2+
3+with lib;
4+
5+{
6+
7+ ###### interface
8+
9+ options = {
10+
11+ programs.system-config-printer = {
12+
13+ enable = mkEnableOption "system-config-printer, a Graphical user interface for CUPS administration";
14+
15+ };
16+
17+ };
18+
19+
20+ ###### implementation
21+
22+ config = mkIf config.programs.system-config-printer.enable {
23+
24+ environment.systemPackages = [
25+ pkgs.system-config-printer
26+ ];
27+
28+ services.system-config-printer.enable = true;
29+
30+ };
31+
32+}
nixos/modules/services/desktops/system-config-printer.nixnew file+38
@@ -0,0 +1,38 @@
1+{ config, pkgs, lib, ... }:
2+
3+with lib;
4+
5+{
6+
7+ ###### interface
8+
9+ options = {
10+
11+ services.system-config-printer = {
12+
13+ enable = mkEnableOption "system-config-printer, a service for CUPS administration used by printing interfaces";
14+
15+ };
16+
17+ };
18+
19+
20+ ###### implementation
21+
22+ config = mkIf config.services.system-config-printer.enable {
23+
24+ services.dbus.packages = [
25+ pkgs.system-config-printer
26+ ];
27+
28+ systemd.packages = [
29+ pkgs.system-config-printer
30+ ];
31+
32+ services.udev.packages = [
33+ pkgs.system-config-printer
34+ ];
35+
36+ };
37+
38+}
nixos/modules/services/x11/desktop-managers/gnome3.nix+1−2
@@ -233,10 +233,9 @@ in
233233 services.gnome3.gnome-user-share.enable = mkDefault true;
234234 services.gnome3.rygel.enable = mkDefault true;
235235 services.gvfs.enable = true;
236+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
236237 services.telepathy.enable = mkDefault true;
237238 systemd.packages = [ pkgs.gnome3.vino ];
238− services.dbus.packages =
239− optional config.services.printing.enable pkgs.system-config-printer;
240239
241240 services.avahi.enable = mkDefault true;
242241
nixos/modules/services/x11/desktop-managers/mate.nix+3
@@ -98,6 +98,9 @@ in
9898 programs.bash.vteIntegration = mkDefault true;
9999 programs.zsh.vteIntegration = mkDefault true;
100100
101+ # Mate uses this for printing
102+ programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
103+
101104 services.gnome3.at-spi2-core.enable = true;
102105 services.gnome3.gnome-keyring.enable = true;
103106 services.gnome3.gnome-settings-daemon.enable = true;
nixos/modules/services/x11/desktop-managers/pantheon.nix+3−3
@@ -113,9 +113,9 @@ in
113113 services.colord.enable = mkDefault true;
114114 services.pantheon.files.enable = mkDefault true;
115115 services.tumbler.enable = mkDefault true;
116− services.dbus.packages = mkMerge [
117− ([ pkgs.pantheon.switchboard-plug-power ])
118− (mkIf config.services.printing.enable ([pkgs.system-config-printer]) )
116+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
117+ services.dbus.packages = [
118+ pkgs.pantheon.switchboard-plug-power
119119 ];
120120 services.pantheon.contractor.enable = mkDefault true;
121121 services.gnome3.at-spi2-core.enable = true;
nixos/modules/services/x11/desktop-managers/plasma5.nix+1−2
@@ -210,8 +210,7 @@ in
210210 # Enable helpful DBus services.
211211 services.udisks2.enable = true;
212212 services.upower.enable = config.powerManagement.enable;
213− services.dbus.packages =
214− mkIf config.services.printing.enable [ pkgs.system-config-printer ];
213+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
215214
216215 # Extra UDEV rules used by Solid
217216 services.udev.packages = [
nixos/modules/services/x11/desktop-managers/xfce4-14.nix+1−2
@@ -137,8 +137,7 @@ in
137137 services.gvfs.enable = true;
138138 services.gvfs.package = pkgs.xfce.gvfs;
139139 services.tumbler.enable = true;
140− services.dbus.packages =
141− optional config.services.printing.enable pkgs.system-config-printer;
140+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
142141 services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
143142
144143 # Enable default programs
pkgs/tools/misc/system-config-printer/default.nix+3
@@ -61,6 +61,9 @@ stdenv.mkDerivation rec {
6161 # Manually expand literal "$(out)", which have failed to expand
6262 sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \
6363 -i "$out/etc/systemd/system/configure-printer@.service"
64+
65+ substituteInPlace $out/etc/udev/rules.d/70-printers.rules \
66+ --replace "udev-configure-printer" "$out/etc/udev/udev-configure-printer"
6467 '';
6568
6669 meta = {