Skip to content

Commit a38f191

Browse files
committed
systemd: 231 -> 232
Includes adding some more upstream units and removing obsolete (-.slice) ones.
1 parent 6973c77 commit a38f191

File tree

4 files changed

+28
-22
lines changed

4 files changed

+28
-22
lines changed

nixos/modules/system/boot/networkd.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,8 +667,10 @@ in
667667

668668
config = mkIf config.systemd.network.enable {
669669

670-
systemd.additionalUpstreamSystemUnits =
671-
[ "systemd-networkd.service" "systemd-networkd-wait-online.service" ];
670+
systemd.additionalUpstreamSystemUnits = [
671+
"systemd-networkd.service" "systemd-networkd-wait-online.service"
672+
"org.freedesktop.network1.busname"
673+
];
672674

673675
systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
674676
// mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs

nixos/modules/system/boot/resolved.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ in
7171

7272
config = mkIf cfg.enable {
7373

74-
systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ];
74+
systemd.additionalUpstreamSystemUnits = [
75+
"systemd-resolved.service" "org.freedesktop.resolve1.busname"
76+
];
7577

7678
systemd.services.systemd-resolved = {
7779
wantedBy = [ "multi-user.target" ];

nixos/modules/system/boot/systemd.nix

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ let
1717
"busnames.target"
1818
"sysinit.target"
1919
"sockets.target"
20+
"exit.target"
2021
"graphical.target"
2122
"multi-user.target"
2223
"network.target"
@@ -41,11 +42,13 @@ let
4142
"systemd-udevd.service"
4243
"systemd-udev-settle.service"
4344
"systemd-udev-trigger.service"
45+
"systemd-hwdb-update.service"
4446

4547
# Consoles.
4648
"getty.target"
4749
"getty@.service"
4850
"serial-getty@.service"
51+
"console-getty.service"
4952
"container-getty@.service"
5053
"systemd-vconsole-setup.service"
5154

@@ -72,6 +75,7 @@ let
7275
"systemd-journal-flush.service"
7376
"systemd-journal-gatewayd.socket"
7477
"systemd-journal-gatewayd.service"
78+
"systemd-journal-catalog-update.service"
7579
"systemd-journald-audit.socket"
7680
"systemd-journald-dev-log.socket"
7781
"syslog.socket"
@@ -104,15 +108,16 @@ let
104108
"systemd-random-seed.service"
105109
"systemd-backlight@.service"
106110
"systemd-rfkill.service"
111+
"systemd-rfkill.socket"
107112

108113
# Hibernate / suspend.
109114
"hibernate.target"
110115
"suspend.target"
111116
"sleep.target"
112117
"hybrid-sleep.target"
113118
"systemd-hibernate.service"
114-
"systemd-suspend.service"
115119
"systemd-hybrid-sleep.service"
120+
"systemd-suspend.service"
116121

117122
# Reboot stuff.
118123
"reboot.target"
@@ -136,10 +141,10 @@ let
136141

137142
# Slices / containers.
138143
"slices.target"
139-
"-.slice"
140144
"system.slice"
141145
"user.slice"
142146
"machine.slice"
147+
"machines.target"
143148
"systemd-machined.service"
144149
"systemd-nspawn@.service"
145150

@@ -162,12 +167,12 @@ let
162167
"systemd-localed.service"
163168
"systemd-hostnamed.service"
164169
"systemd-binfmt.service"
170+
"systemd-exit.service"
165171
]
166172
++ cfg.additionalUpstreamSystemUnits;
167173

168174
upstreamSystemWants =
169-
[ #"basic.target.wants"
170-
"sysinit.target.wants"
175+
[ "sysinit.target.wants"
171176
"sockets.target.wants"
172177
"local-fs.target.wants"
173178
"multi-user.target.wants"
@@ -176,11 +181,18 @@ let
176181

177182
upstreamUserUnits =
178183
[ "basic.target"
184+
"bluetooth.target"
185+
"busnames.target"
179186
"default.target"
180187
"exit.target"
188+
"graphical-session-pre.target"
189+
"graphical-session.target"
181190
"paths.target"
191+
"printer.target"
182192
"shutdown.target"
193+
"smartcard.target"
183194
"sockets.target"
195+
"sound.target"
184196
"systemd-exit.service"
185197
"timers.target"
186198
];

pkgs/os-specific/linux/systemd/default.nix

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,21 @@
44
, kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
55
, iptables, gnu-efi
66
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
7-
, enableKDbus ? false
87
}:
98

109
assert stdenv.isLinux;
1110

1211
stdenv.mkDerivation rec {
13-
version = "231";
12+
version = "232";
1413
name = "systemd-${version}";
1514

1615
src = fetchFromGitHub {
17-
owner = "NixOS";
16+
owner = "mayflower";
1817
repo = "systemd";
19-
rev = "3b11791d323cf2d0e00a156967021e1ae9119de2";
20-
sha256 = "1xzldwd6407jdg6z36smd49d961nmqykpay969i4xfdldcgyjdv0";
18+
rev = "42a48d16c0ec48330286f8332a4628e1d71c759b";
19+
sha256 = "18bcxbba1wk44xhlsna18x3c4b07sq6670wnsy2xy1x2kzfnmhdl";
2120
};
2221

23-
patches = [
24-
# Fixes tty issues, see #18158. Remove when upgrading to systemd 232.
25-
(fetchpatch {
26-
url = "https://github.com/systemd/systemd/commit/bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d.patch";
27-
sha256 = "1gc9fxdlnfmjhbi77xfwcb5mkhryjsdi0rmbh2lq2qq737iyqqwm";
28-
})
29-
];
30-
3122
outputs = [ "out" "lib" "man" "dev" ];
3223

3324
buildInputs =
@@ -53,7 +44,6 @@ stdenv.mkDerivation rec {
5344
"--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"
5445
"--with-dbussessionservicedir=$(out)/share/dbus-1/services"
5546
"--with-tty-gid=3" # tty in NixOS has gid 3
56-
"--enable-compat-libs" # get rid of this eventually
5747
"--disable-tests"
5848

5949
"--enable-lz4"
@@ -80,7 +70,7 @@ stdenv.mkDerivation rec {
8070
"--with-sysvinit-path="
8171
"--with-sysvrcnd-path="
8272
"--with-rc-local-script-path-stop=/etc/halt.local"
83-
] ++ (if enableKDbus then [ "--enable-kdbus" ] else [ "--disable-kdbus" ]);
73+
];
8474

8575
hardeningDisable = [ "stackprotector" ];
8676

0 commit comments

Comments
 (0)