systemd: 234 -> 237

Co-Authored-By: Florian Klink <flokli@flokli.de>
Co-Authored-By: Andreas Rammhold <andreas@rammhold.de>

nixos/modules/system/boot/networkd.nix

@@ -700,7 +700,6 @@ in
 
     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

nixos/modules/system/boot/resolved.nix

@@ -126,7 +126,7 @@ in
   config = mkIf cfg.enable {
 
     systemd.additionalUpstreamSystemUnits = [
-      "systemd-resolved.service" "org.freedesktop.resolve1.busname"
+      "systemd-resolved.service"
     ];
 
     systemd.services.systemd-resolved = {

nixos/modules/system/boot/systemd.nix

@@ -14,7 +14,6 @@ let
   upstreamSystemUnits =
     [ # Targets.
       "basic.target"
-      "busnames.target"
       "sysinit.target"
       "sockets.target"
       "exit.target"
@@ -47,6 +46,7 @@ let
 
       # Consoles.
       "getty.target"
+      "getty-pre.target"
       "getty@.service"
       "serial-getty@.service"
       "console-getty.service"
@@ -63,10 +63,7 @@ let
       "systemd-logind.service"
       "autovt@.service"
       "systemd-user-sessions.service"
-      "dbus-org.freedesktop.login1.service"
       "dbus-org.freedesktop.machine1.service"
-      "org.freedesktop.login1.busname"
-      "org.freedesktop.machine1.busname"
       "user@.service"
 
       # Journal.
@@ -99,7 +96,6 @@ let
       "swap.target"
       "dev-hugepages.mount"
       "dev-mqueue.mount"
-      "proc-sys-fs-binfmt_misc.mount"
       "sys-fs-fuse-connections.mount"
       "sys-kernel-config.mount"
       "sys-kernel-debug.mount"
@@ -155,19 +151,16 @@ let
       "systemd-tmpfiles-setup-dev.service"
 
       # Misc.
-      "org.freedesktop.systemd1.busname"
       "systemd-sysctl.service"
       "dbus-org.freedesktop.timedate1.service"
       "dbus-org.freedesktop.locale1.service"
       "dbus-org.freedesktop.hostname1.service"
-      "org.freedesktop.timedate1.busname"
-      "org.freedesktop.locale1.busname"
-      "org.freedesktop.hostname1.busname"
       "systemd-timedated.service"
       "systemd-localed.service"
       "systemd-hostnamed.service"
       "systemd-binfmt.service"
       "systemd-exit.service"
+      "systemd-update-done.service"
     ]
     ++ cfg.additionalUpstreamSystemUnits;
 
@@ -182,7 +175,6 @@ let
   upstreamUserUnits =
     [ "basic.target"
       "bluetooth.target"
-      "busnames.target"
       "default.target"
       "exit.target"
       "graphical-session-pre.target"
@@ -789,8 +781,7 @@ in
 
         # Keep a persistent journal. Note that systemd-tmpfiles will
         # set proper ownership/permissions.
-        # FIXME: revert to 0700 with systemd v233.
+        mkdir -m 0700 -p /var/log/journal
-        mkdir -m 0750 -p /var/log/journal
       '';
 
     users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
@@ -887,7 +878,7 @@ in
     systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
     systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
     systemd.targets.network-online.wantedBy = [ "multi-user.target" ];
-    systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ];
+    systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ];
 
     # Don't bother with certain units in containers.
     systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";

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

@@ -1,103 +1,113 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
 , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
-, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
+, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
-, kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp
+, audit, lz4, bzip2, kexectools, libmicrohttpd
-, iptables, gnu-efi
+, linuxHeaders ? stdenv.cc.libc.linuxHeaders
+, libseccomp, iptables, gnu-efi
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
+, ninja, meson, python3Packages, glibcLocales
+, patchelf
 }:
 
 assert stdenv.isLinux;
 
+let pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
+
+in
+
   stdenv.mkDerivation rec {
-  version = "234";
+    version = "237";
     name = "systemd-${version}";
 
     src = fetchFromGitHub {
-    owner = "nixos";
+      owner = "NixOS";
       repo = "systemd";
-    rev = "eef5613fda5";
+      rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792";
-    sha256 = "0wgh5y319v56hcs82mhs58ipb100cz4x41vz3kh4bq1n7sx88cdz";
+      sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq";
     };
 
     outputs = [ "out" "lib" "man" "dev" ];
 
     nativeBuildInputs =
-    [ pkgconfig intltool gperf libxslt
+      [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
-      /* FIXME: we may be able to prevent the following dependencies
+        ninja meson
-         by generating an autoconf'd tarball, but that's probably not
+        coreutils # meson calls date, stat etc.
-         worth it. */
+        pythonLxmlEnv glibcLocales
-      autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
+        patchelf
       ];
     buildInputs =
       [ linuxHeaders libcap kmod xz pam acl
-      /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror
+        /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2
-      libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor
+        libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
         iptables gnu-efi
       ];
 
-  configureFlags =
+    #dontAddPrefix = true;
-    [ "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      "--with-rootprefix=$(out)"
-      "--with-kbd-loadkeys=${kbd}/bin/loadkeys"
-      "--with-kbd-setfont=${kbd}/bin/setfont"
-      "--with-rootprefix=$(out)"
-      "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"
-      "--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
-      "--disable-tests"
 
-      "--enable-lz4"
+    mesonFlags = [
-      "--enable-hostnamed"
+      "-Dloadkeys-path=${kbd}/bin/loadkeys"
-      "--enable-networkd"
+      "-Dsetfont-path=${kbd}/bin/setfont"
-      "--disable-sysusers"
+      "-Dtty-gid=3" # tty in NixOS has gid 3
-      "--enable-timedated"
+      # "-Dtests=" # TODO
-      "--enable-timesyncd"
+      "-Dlz4=true"
-      "--disable-firstboot"
+      "-Dhostnamed=true"
-      "--enable-localed"
+      "-Dnetworkd=true"
-      "--enable-resolved"
+      "-Dsysusers=false"
-      "--disable-split-usr"
+      "-Dtimedated=true"
-      "--disable-libcurl"
+      "-Dtimesyncd=true"
-      "--disable-libidn"
+      "-Dfirstboot=false"
-      "--disable-quotacheck"
+      "-Dlocaled=true"
-      "--disable-ldconfig"
+      "-Dresolve=true"
-      "--disable-smack"
+      "-Dsplit-usr=false"
+      "-Dlibcurl=false"
+      "-Dlibidn=false"
+      "-Dlibidn2=true"
+      "-Dquotacheck=false"
+      "-Dldconfig=false"
+      "-Dsmack=true"
+      "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work
+      "-Dsystem-gid-max=499"
+  #    "-Dtime-epoch=1"
 
-      (if stdenv.isArm then "--disable-gnuefi" else "--enable-gnuefi")
+      (if stdenv.isArm then "-Dgnu-efi=false" else "-Dgnu-efi=true")
-      "--with-efi-libdir=${gnu-efi}/lib"
+      "-Defi-libdir=${gnu-efi}/lib"
-      "--with-efi-includedir=${gnu-efi}/include"
+      "-Defi-includedir=${gnu-efi}/include/efi"
-      "--with-efi-ldsdir=${gnu-efi}/lib"
+      "-Defi-ldsdir=${gnu-efi}/lib"
 
-      "--with-sysvinit-path="
+      "-Dsysvinit-path="
-      "--with-sysvrcnd-path="
+      "-Dsysvrcnd-path="
-      "--with-rc-local-script-path-stop=/etc/halt.local"
-    ];
-
-  hardeningDisable = [ "stackprotector" ];
-
-  patches = [
-    # TODO: Remove this patch when we have a systemd version
-    # with https://github.com/systemd/systemd/pull/6678
-    (fetchpatch {
-        url = "https://github.com/systemd/systemd/commit/58a78ae77063eddfcd23ea272bd2e0ddc9ea3ff7.patch";
-        sha256 = "0g3pvqigs69mciw6lj3zg12dmxnhwxndwxdjg78af52xrp0djfg8";
-    })
       ];
 
     preConfigure =
       ''
-      unset RANLIB
+        mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
+        mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d)
+        mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services)
+        mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services)
+        mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d)
+        mesonFlagsArray+=(-Dsysconfdir=$out/etc)
+        mesonFlagsArray+=(-Drootprefix=$out)
+        mesonFlagsArray+=(-Dlibdir=$lib/lib)
+        mesonFlagsArray+=(-Drootlibdir=$lib/lib)
+        mesonFlagsArray+=(-Dmandir=$man/lib)
+        mesonFlagsArray+=(-Dincludedir=$dev/include)
+        mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig)
+        mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig)
 
-      ./autogen.sh
+        # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are?
+        substituteInPlace meson.build \
+          --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \
+                    "includedir = '$dev/include'" \
+          --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \
+                    "libdir = '$lib/lib'"
 
+        export LC_ALL="en_US.UTF-8";
         # FIXME: patch this in systemd properly (and send upstream).
+        # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount
         for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
           test -e $i
           substituteInPlace $i \
             --replace /usr/bin/getent ${stdenv.glibc.bin}/bin/getent \
-          --replace /bin/mount ${utillinux.bin}/bin/mount \
-          --replace /bin/umount ${utillinux.bin}/bin/umount \
             --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \
             --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \
             --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
@@ -108,19 +118,35 @@ stdenv.mkDerivation rec {
             --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
         done
 
+        for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do
+          substituteInPlace $i \
+            --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python"
+        done
+
+        for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do
+          substituteInPlace $i \
+            --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python"
+        done
+
         substituteInPlace src/journal/catalog.c \
           --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
-
-      configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
       '';
 
-  PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
+    # These defines are overridden by CFLAGS and would trigger annoying
+    # warning messages
+    postConfigure = ''
+      substituteInPlace config.h \
+        --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \
+        --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
+        --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
+    '';
+
+    hardeningDisable = [ "stackprotector" ];
 
     NIX_CFLAGS_COMPILE =
       [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would
         # lead to a cyclic dependency.
         "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
-      "-fno-stack-protector"
 
         # Set the release_agent on /sys/fs/cgroup/systemd to the
         # currently running systemd (/run/current-system/systemd) so
@@ -130,13 +156,6 @@ stdenv.mkDerivation rec {
         "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
       ];
 
-  installFlags =
-    [ "localstatedir=$(TMPDIR)/var"
-      "sysconfdir=$(out)/etc"
-      "sysvinitdir=$(TMPDIR)/etc/init.d"
-      "pamconfdir=$(out)/etc/pam.d"
-    ];
-
     postInstall =
       ''
         # sysinit.target: Don't depend on
@@ -165,8 +184,6 @@ stdenv.mkDerivation rec {
 
         rm -rf $out/etc/rpm
 
-      rm $lib/lib/*.la
-
         # "kernel-install" shouldn't be used on NixOS.
         find $out -name "*kernel-install*" -exec rm {} \;
 
@@ -177,6 +194,18 @@ stdenv.mkDerivation rec {
 
     enableParallelBuilding = true;
 
+    # The rpath to the shared systemd library is not added by meson. The
+    # functionality was removed by a nixpkgs patch because it would overwrite
+    # the existing rpath.
+    postFixup = ''
+      sharedLib=libsystemd-shared-${version}.so
+      for prog in `find $out -type f -executable`; do
+        (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && (
+          patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog
+        ) || true
+      done
+    '';
+
     # The interface version prevents NixOS from switching to an
     # incompatible systemd at runtime.  (Switching across reboots is
     # fine, of course.)  It should be increased whenever systemd changes