commit e6fb1e63d1d1fa037f4cd4aa26fda06b00f8a7a3 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/installer/tools/tools.nix

···

       34
       34
        
           name = "nixos-generate-config";

     

       35
       35
        
           src = ./nixos-generate-config.pl;

     

       36
       36
        
           perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";

     

       37
       37
       -
           detectvirt = "${pkgs.systemd}/bin/systemd-detect-virt";

     

       37
       37
       +
           detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";

     

       38
       38
        
           btrfs = "${pkgs.btrfs-progs}/bin/btrfs";

     

       39
       39
        
           inherit (config.system.nixos-generate-config) configuration desktopConfiguration;

     

       40
       40
        
           xserverEnabled = config.services.xserver.enable;

+2 -2

nixos/modules/security/pam.nix

···

       626
       626
        
                   session optional ${pkgs.otpw}/lib/security/pam_otpw.so

     

       627
       627
        
                 '' +

     

       628
       628
        
                 optionalString cfg.startSession ''

     

       629
       629
       -
                   session optional ${pkgs.systemd}/lib/security/pam_systemd.so

     

       629
       629
       +
                   session optional ${config.systemd.package}/lib/security/pam_systemd.so

     

       630
       630
        
                 '' +

     

       631
       631
        
                 optionalString cfg.forwardXAuth ''

     

       632
       632
        
                   session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99

     
···

       1242
       1242
        
               mr ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so,

     

       1243
       1243
        
             '' +

     

       1244
       1244
        
             optionalString (isEnabled (cfg: cfg.startSession)) ''

     

       1245
       1245
       -
               mr ${pkgs.systemd}/lib/security/pam_systemd.so,

     

       1245
       1245
       +
               mr ${config.systemd.package}/lib/security/pam_systemd.so,

     

       1246
       1246
        
             '' +

     

       1247
       1247
        
             optionalString (isEnabled (cfg: cfg.enableAppArmor)

     

       1248
       1248
        
                            && config.security.apparmor.enable) ''

+1 -1

nixos/modules/services/logging/logstash.nix

···

       109
       109
        
                 '''

     

       110
       110
        
                   # Read from journal

     

       111
       111
        
                   pipe {

     

       112
       112
       -
                     command => "''${pkgs.systemd}/bin/journalctl -f -o json"

     

       112
       112
       +
                     command => "''${config.systemd.package}/bin/journalctl -f -o json"

     

       113
       113
        
                     type => "syslog" codec => json {}

     

       114
       114
        
                   }

     

       115
       115
        
                 '''

+1 -1

nixos/modules/services/mail/spamassassin.nix

···

       135
       135
        
               User = "spamd";

     

       136
       136
        
               Group = "spamd";

     

       137
       137
        
               StateDirectory = "spamassassin";

     

       138
       138
       -
               ExecStartPost = "+${pkgs.systemd}/bin/systemctl -q --no-block try-reload-or-restart spamd.service";

     

       138
       138
       +
               ExecStartPost = "+${config.systemd.package}/bin/systemctl -q --no-block try-reload-or-restart spamd.service";

     

       139
       139
        
             };

     

       140
       140
        
       

     

       141
       141
        
             script = ''

+2 -2

nixos/modules/services/networking/supplicant.nix

···

       226
       226
        
                     ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="${i}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="supplicant-${replaceChars [" "] ["-"] iface}.service", TAG+="SUPPLICANT_ASSIGNED"''))}

     

       227
       227
        
       

     

       228
       228
        
                 ${optionalString (hasAttr "WLAN" cfg) ''

     

       229
       229
       -
                   ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="${pkgs.systemd}/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-wlan@$result.service"

     

       229
       229
       +
                   ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="/run/current-system/systemd/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-wlan@$result.service"

     

       230
       230
        
                 ''}

     

       231
       231
        
                 ${optionalString (hasAttr "LAN" cfg) ''

     

       232
       232
       -
                   ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="lan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="${pkgs.systemd}/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-lan@$result.service"

     

       232
       232
       +
                   ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="lan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="/run/current-system/systemd/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-lan@$result.service"

     

       233
       233
        
                 ''}

     

       234
       234
        
               '';

     

       235
       235
        
             })];

+1 -1

nixos/modules/services/security/sshguard.nix

···

       17
       17
        
             else "sshg-fw-ipset";

     

       18
       18
        
         in pkgs.writeText "sshguard.conf" ''

     

       19
       19
        
           BACKEND="${pkgs.sshguard}/libexec/${backend}"

     

       20
       20
       -
           LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl ${args}"

     

       20
       20
       +
           LOGREADER="LANG=C ${config.systemd.package}/bin/journalctl ${args}"

     

       21
       21
        
         '';

     

       22
       22
        
       

     

       23
       23
        
       in {

+1 -1

nixos/modules/services/wayland/cage.nix

···

       88
       88
        
             account required pam_unix.so

     

       89
       89
        
             session required pam_unix.so

     

       90
       90
        
             session required pam_env.so conffile=/etc/pam/environment readenv=0

     

       91
       91
       -
             session required ${pkgs.systemd}/lib/security/pam_systemd.so

     

       91
       91
       +
             session required ${config.systemd.package}/lib/security/pam_systemd.so

     

       92
       92
        
           '';

     

       93
       93
        
       

     

       94
       94
        
           hardware.opengl.enable = mkDefault true;

+1 -1

nixos/modules/services/x11/display-managers/gdm.nix

···

       298
       298
        
       

     

       299
       299
        
               session  required       pam_succeed_if.so audit quiet_success user = gdm

     

       300
       300
        
               session  required       pam_env.so conffile=/etc/pam/environment readenv=0

     

       301
       301
       -
               session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so

     

       301
       301
       +
               session  optional       ${config.systemd.package}/lib/security/pam_systemd.so

     

       302
       302
        
               session  optional       pam_keyinit.so force revoke

     

       303
       303
        
               session  optional       pam_permit.so

     

       304
       304
        
             '';

+1 -1

nixos/modules/services/x11/display-managers/lightdm.nix

···

       287
       287
        
       

     

       288
       288
        
               session  required       pam_succeed_if.so audit quiet_success user = lightdm

     

       289
       289
        
               session  required       pam_env.so conffile=/etc/pam/environment readenv=0

     

       290
       290
       -
               session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so

     

       290
       290
       +
               session  optional       ${config.systemd.package}/lib/security/pam_systemd.so

     

       291
       291
        
               session  optional       pam_keyinit.so force revoke

     

       292
       292
        
               session  optional       pam_permit.so

     

       293
       293
        
           '';

+1 -1

nixos/modules/services/x11/display-managers/sddm.nix

···

       231
       231
        
       

     

       232
       232
        
               session  required       pam_succeed_if.so audit quiet_success user = sddm

     

       233
       233
        
               session  required       pam_env.so conffile=/etc/pam/environment readenv=0

     

       234
       234
       -
               session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so

     

       234
       234
       +
               session  optional       ${config.systemd.package}/lib/security/pam_systemd.so

     

       235
       235
        
               session  optional       pam_keyinit.so force revoke

     

       236
       236
        
               session  optional       pam_permit.so

     

       237
       237
        
             '';

+1 -1

nixos/modules/system/boot/modprobe.nix

···

       52
       52
        
             '';

     

       53
       53
        
           environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;

     

       54
       54
        
       

     

       55
       55
       -
           environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf";

     

       55
       55
       +
           environment.etc."modprobe.d/systemd.conf".source = "${config.systemd.package}/lib/modprobe.d/systemd.conf";

     

       56
       56
        
       

     

       57
       57
        
           environment.systemPackages = [ pkgs.kmod ];

     

       58
       58

+1 -1

nixos/modules/tasks/auto-upgrade.nix

···

       190
       190
        
               nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild";

     

       191
       191
        
               date     = "${pkgs.coreutils}/bin/date";

     

       192
       192
        
               readlink = "${pkgs.coreutils}/bin/readlink";

     

       193
       193
       -
               shutdown = "${pkgs.systemd}/bin/shutdown";

     

       193
       193
       +
               shutdown = "${config.systemd.package}/bin/shutdown";

     

       194
       194
        
               upgradeFlag = optional (cfg.channel == null) "--upgrade";

     

       195
       195
        
             in if cfg.allowReboot then ''

     

       196
       196
        
               ${nixos-rebuild} boot ${toString (cfg.flags ++ upgradeFlag)}

+1 -1

nixos/modules/virtualisation/amazon-init.nix

···

       11
       11
        
           echo "attempting to fetch configuration from EC2 user data..."

     

       12
       12
        
       

     

       13
       13
        
           export HOME=/root

     

       14
       14
       -
           export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused pkgs.xz config.system.build.nixos-rebuild]}:$PATH

     

       14
       14
       +
           export PATH=${pkgs.lib.makeBinPath [ config.nix.package config.systemd.package pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused pkgs.xz config.system.build.nixos-rebuild]}:$PATH

     

       15
       15
        
           export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels

     

       16
       16
        
       

     

       17
       17
        
           userData=/etc/ec2-metadata/user-data

+1 -1

nixos/modules/virtualisation/digital-ocean-init.nix

···

       46
       46
        
               RemainAfterExit = true;

     

       47
       47
        
             };

     

       48
       48
        
             restartIfChanged = false;

     

       49
       49
       -
             path = [ pkgs.jq pkgs.gnused pkgs.gnugrep pkgs.systemd config.nix.package config.system.build.nixos-rebuild ];

     

       49
       49
       +
             path = [ pkgs.jq pkgs.gnused pkgs.gnugrep config.systemd.package config.nix.package config.system.build.nixos-rebuild ];

     

       50
       50
        
             environment = {

     

       51
       51
        
               HOME = "/root";

     

       52
       52
        
               NIX_PATH = concatStringsSep ":" [