commit a38f1911d34f2a72e15d5e98d76bece6cb8042a8 · pyrox.dev/nixpkgs

+4 -2

nixos/modules/system/boot/networkd.nix

···

       667
       667
        
       

     

       668
       668
        
         config = mkIf config.systemd.network.enable {

     

       669
       669
        
       

     

       670
       670
       -
           systemd.additionalUpstreamSystemUnits =

     

       671
       671
       -
             [ "systemd-networkd.service" "systemd-networkd-wait-online.service" ];

     

       670
       670
       +
           systemd.additionalUpstreamSystemUnits = [

     

       671
       671
       +
             "systemd-networkd.service" "systemd-networkd-wait-online.service"

     

       672
       672
       +
             "org.freedesktop.network1.busname"

     

       673
       673
       +
           ];

     

       672
       674
        
       

     

       673
       675
        
           systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links

     

       674
       676
        
             // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs

+3 -1

nixos/modules/system/boot/resolved.nix

···

       71
       71
        
       

     

       72
       72
        
         config = mkIf cfg.enable {

     

       73
       73
        
       

     

       74
       74
       -
           systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ];

     

       74
       74
       +
           systemd.additionalUpstreamSystemUnits = [

     

       75
       75
       +
             "systemd-resolved.service" "org.freedesktop.resolve1.busname"

     

       76
       76
       +
           ];

     

       75
       77
        
       

     

       76
       78
        
           systemd.services.systemd-resolved = {

     

       77
       79
        
             wantedBy = [ "multi-user.target" ];

+16 -4

nixos/modules/system/boot/systemd.nix

···

       17
       17
        
             "busnames.target"

     

       18
       18
        
             "sysinit.target"

     

       19
       19
        
             "sockets.target"

     

       20
       20
       +
             "exit.target"

     

       20
       21
        
             "graphical.target"

     

       21
       22
        
             "multi-user.target"

     

       22
       23
        
             "network.target"

     
···

       41
       42
        
             "systemd-udevd.service"

     

       42
       43
        
             "systemd-udev-settle.service"

     

       43
       44
        
             "systemd-udev-trigger.service"

     

       45
       45
       +
             "systemd-hwdb-update.service"

     

       44
       46
        
       

     

       45
       47
        
             # Consoles.

     

       46
       48
        
             "getty.target"

     

       47
       49
        
             "getty@.service"

     

       48
       50
        
             "serial-getty@.service"

     

       51
       51
       +
             "console-getty.service"

     

       49
       52
        
             "container-getty@.service"

     

       50
       53
        
             "systemd-vconsole-setup.service"

     

       51
       54
        
       

     
···

       72
       75
        
             "systemd-journal-flush.service"

     

       73
       76
        
             "systemd-journal-gatewayd.socket"

     

       74
       77
        
             "systemd-journal-gatewayd.service"

     

       78
       78
       +
             "systemd-journal-catalog-update.service"

     

       75
       79
        
             "systemd-journald-audit.socket"

     

       76
       80
        
             "systemd-journald-dev-log.socket"

     

       77
       81
        
             "syslog.socket"

     
···

       104
       108
        
             "systemd-random-seed.service"

     

       105
       109
        
             "systemd-backlight@.service"

     

       106
       110
        
             "systemd-rfkill.service"

     

       111
       111
       +
             "systemd-rfkill.socket"

     

       107
       112
        
       

     

       108
       113
        
             # Hibernate / suspend.

     

       109
       114
        
             "hibernate.target"

     
···

       111
       116
        
             "sleep.target"

     

       112
       117
        
             "hybrid-sleep.target"

     

       113
       118
        
             "systemd-hibernate.service"

     

       114
       114
       -
             "systemd-suspend.service"

     

       115
       119
        
             "systemd-hybrid-sleep.service"

     

       120
       120
       +
             "systemd-suspend.service"

     

       116
       121
        
       

     

       117
       122
        
             # Reboot stuff.

     

       118
       123
        
             "reboot.target"

     
···

       136
       141
        
       

     

       137
       142
        
             # Slices / containers.

     

       138
       143
        
             "slices.target"

     

       139
       139
       -
             "-.slice"

     

       140
       144
        
             "system.slice"

     

       141
       145
        
             "user.slice"

     

       142
       146
        
             "machine.slice"

     

       147
       147
       +
             "machines.target"

     

       143
       148
        
             "systemd-machined.service"

     

       144
       149
        
             "systemd-nspawn@.service"

     

       145
       150
        
       

     
···

       162
       167
        
             "systemd-localed.service"

     

       163
       168
        
             "systemd-hostnamed.service"

     

       164
       169
        
             "systemd-binfmt.service"

     

       170
       170
       +
             "systemd-exit.service"

     

       165
       171
        
           ]

     

       166
       172
        
           ++ cfg.additionalUpstreamSystemUnits;

     

       167
       173
        
       

     

       168
       174
        
         upstreamSystemWants =

     

       169
       169
       -
           [ #"basic.target.wants"

     

       170
       170
       -
             "sysinit.target.wants"

     

       175
       175
       +
           [ "sysinit.target.wants"

     

       171
       176
        
             "sockets.target.wants"

     

       172
       177
        
             "local-fs.target.wants"

     

       173
       178
        
             "multi-user.target.wants"

     
···

       176
       181
        
       

     

       177
       182
        
         upstreamUserUnits =

     

       178
       183
        
           [ "basic.target"

     

       184
       184
       +
             "bluetooth.target"

     

       185
       185
       +
             "busnames.target"

     

       179
       186
        
             "default.target"

     

       180
       187
        
             "exit.target"

     

       188
       188
       +
             "graphical-session-pre.target"

     

       189
       189
       +
             "graphical-session.target"

     

       181
       190
        
             "paths.target"

     

       191
       191
       +
             "printer.target"

     

       182
       192
        
             "shutdown.target"

     

       193
       193
       +
             "smartcard.target"

     

       183
       194
        
             "sockets.target"

     

       195
       195
       +
             "sound.target"

     

       184
       196
        
             "systemd-exit.service"

     

       185
       197
        
             "timers.target"

     

       186
       198
        
           ];

+5 -15

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

···

       4
       4
        
       , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp

     

       5
       5
        
       , iptables, gnu-efi

     

       6
       6
        
       , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45

     

       7
       7
       -
       , enableKDbus ? false

     

       8
       7
        
       }:

     

       9
       8
        
       

     

       10
       9
        
       assert stdenv.isLinux;

     

       11
       10
        
       

     

       12
       11
        
       stdenv.mkDerivation rec {

     

       13
       13
       -
         version = "231";

     

       12
       12
       +
         version = "232";

     

       14
       13
        
         name = "systemd-${version}";

     

       15
       14
        
       

     

       16
       15
        
         src = fetchFromGitHub {

     

       17
       17
       -
           owner = "NixOS";

     

       16
       16
       +
           owner = "mayflower";

     

       18
       17
        
           repo = "systemd";

     

       19
       19
       -
           rev = "3b11791d323cf2d0e00a156967021e1ae9119de2";

     

       20
       20
       -
           sha256 = "1xzldwd6407jdg6z36smd49d961nmqykpay969i4xfdldcgyjdv0";

     

       18
       18
       +
           rev = "42a48d16c0ec48330286f8332a4628e1d71c759b";

     

       19
       19
       +
           sha256 = "18bcxbba1wk44xhlsna18x3c4b07sq6670wnsy2xy1x2kzfnmhdl";

     

       21
       20
        
         };

     

       22
       21
        
       

     

       23
       23
       -
         patches = [

     

       24
       24
       -
           # Fixes tty issues, see #18158. Remove when upgrading to systemd 232.

     

       25
       25
       -
           (fetchpatch {

     

       26
       26
       -
             url = "https://github.com/systemd/systemd/commit/bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d.patch";

     

       27
       27
       -
             sha256 = "1gc9fxdlnfmjhbi77xfwcb5mkhryjsdi0rmbh2lq2qq737iyqqwm";

     

       28
       28
       -
           })

     

       29
       29
       -
         ];

     

       30
       30
       -
       

     

       31
       22
        
         outputs = [ "out" "lib" "man" "dev" ];

     

       32
       23
        
       

     

       33
       24
        
         buildInputs =

     
···

       53
       44
        
             "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"

     

       54
       45
        
             "--with-dbussessionservicedir=$(out)/share/dbus-1/services"

     

       55
       46
        
             "--with-tty-gid=3" # tty in NixOS has gid 3

     

       56
       56
       -
             "--enable-compat-libs" # get rid of this eventually

     

       57
       47
        
             "--disable-tests"

     

       58
       48
        
       

     

       59
       49
        
             "--enable-lz4"

     
···

       80
       70
        
             "--with-sysvinit-path="

     

       81
       71
        
             "--with-sysvrcnd-path="

     

       82
       72
        
             "--with-rc-local-script-path-stop=/etc/halt.local"

     

       83
       83
       -
           ] ++ (if enableKDbus then [ "--enable-kdbus" ] else [ "--disable-kdbus" ]);

     

       73
       73
       +
           ];

     

       84
       74
        
       

     

       85
       75
        
         hardeningDisable = [ "stackprotector" ];

     

       86
       76