systemd: 231 -> 232

Includes adding some more upstream units and removing obsolete (-.slice) ones.
NixOS · Jan 26, 2017 · a38f1911d34f2a72e15d5e98d76bece6cb8042a8 · a38f191
1 parent 6973c77
commit a38f1911d34f2a72e15d5e98d76bece6cb8042a8
Unified Split

Showing with 28 additions and 22 deletions.

+4 −2 nixos/modules/system/boot/networkd.nix

+3 −1 nixos/modules/system/boot/resolved.nix

+16 −4 nixos/modules/system/boot/systemd.nix

+5 −15 pkgs/os-specific/linux/systemd/default.nix
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
@@ -667,8 +667,10 @@ in

  config = mkIf config.systemd.network.enable {

-    systemd.additionalUpstreamSystemUnits =
-      [ "systemd-networkd.service" "systemd-networkd-wait-online.service" ];
+    systemd.additionalUpstreamSystemUnits = [
+      "systemd-networkd.service" "systemd-networkd-wait-online.service"
+      "org.freedesktop.network1.busname"
+    ];

    systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
      // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
@@ -71,7 +71,9 @@ in

  config = mkIf cfg.enable {

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

    systemd.services.systemd-resolved = {
      wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
@@ -17,6 +17,7 @@ let
      "busnames.target"
      "sysinit.target"
      "sockets.target"
+      "exit.target"
      "graphical.target"
      "multi-user.target"
      "network.target"
@@ -41,11 +42,13 @@ let
      "systemd-udevd.service"
      "systemd-udev-settle.service"
      "systemd-udev-trigger.service"
+      "systemd-hwdb-update.service"

      # Consoles.
      "getty.target"
      "getty@.service"
      "serial-getty@.service"
+      "console-getty.service"
      "container-getty@.service"
      "systemd-vconsole-setup.service"

@@ -72,6 +75,7 @@ let
      "systemd-journal-flush.service"
      "systemd-journal-gatewayd.socket"
      "systemd-journal-gatewayd.service"
+      "systemd-journal-catalog-update.service"
      "systemd-journald-audit.socket"
      "systemd-journald-dev-log.socket"
      "syslog.socket"
@@ -104,15 +108,16 @@ let
      "systemd-random-seed.service"
      "systemd-backlight@.service"
      "systemd-rfkill.service"
+      "systemd-rfkill.socket"

      # Hibernate / suspend.
      "hibernate.target"
      "suspend.target"
      "sleep.target"
      "hybrid-sleep.target"
      "systemd-hibernate.service"
-      "systemd-suspend.service"
      "systemd-hybrid-sleep.service"
+      "systemd-suspend.service"

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

      # Slices / containers.
      "slices.target"
-      "-.slice"
      "system.slice"
      "user.slice"
      "machine.slice"
+      "machines.target"
      "systemd-machined.service"
      "systemd-nspawn@.service"

@@ -162,12 +167,12 @@ let
      "systemd-localed.service"
      "systemd-hostnamed.service"
      "systemd-binfmt.service"
+      "systemd-exit.service"
    ]
    ++ cfg.additionalUpstreamSystemUnits;

  upstreamSystemWants =
-    [ #"basic.target.wants"
-      "sysinit.target.wants"
+    [ "sysinit.target.wants"
      "sockets.target.wants"
      "local-fs.target.wants"
      "multi-user.target.wants"
@@ -176,11 +181,18 @@ let

  upstreamUserUnits =
    [ "basic.target"
+      "bluetooth.target"
+      "busnames.target"
      "default.target"
      "exit.target"
+      "graphical-session-pre.target"
+      "graphical-session.target"
      "paths.target"
+      "printer.target"
      "shutdown.target"
+      "smartcard.target"
      "sockets.target"
+      "sound.target"
      "systemd-exit.service"
      "timers.target"
    ];
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
@@ -4,30 +4,21 @@
 , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
 , iptables, gnu-efi
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
-, enableKDbus ? false
 }:

 assert stdenv.isLinux;

 stdenv.mkDerivation rec {
-  version = "231";
+  version = "232";
  name = "systemd-${version}";

  src = fetchFromGitHub {
-    owner = "NixOS";
+    owner = "mayflower";
    repo = "systemd";
-    rev = "3b11791d323cf2d0e00a156967021e1ae9119de2";
-    sha256 = "1xzldwd6407jdg6z36smd49d961nmqykpay969i4xfdldcgyjdv0";
+    rev = "42a48d16c0ec48330286f8332a4628e1d71c759b";
+    sha256 = "18bcxbba1wk44xhlsna18x3c4b07sq6670wnsy2xy1x2kzfnmhdl";
  };

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

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

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

  hardeningDisable = [ "stackprotector" ];