Unverified Commit eb29401d authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 4f347d69 79bb815a

maintainers/maintainer-list.nix

+9 −0
Original line number Diff line number Diff line
@@ -1285,6 +1285,15 @@ 
      fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691";

    }];

  };

  ataraxiasjel = {

    email = "nix@ataraxiadev.com";

    github = "AtaraxiaSjel";

    githubId = 5314145;

    name = "Dmitriy";

    keys = [{

      fingerprint = "922D A6E7 58A0 FE4C FAB4 E4B2 FD26 6B81 0DF4 8DF2";

    }];

  };

  atemu = {

    name = "Atemu";

    email = "atemu.main+nixpkgs@gmail.com";

nixos/modules/services/hardware/udev.nix

+8 −1
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ let 
    SUBSYSTEM=="input", KERNEL=="mice", TAG+="systemd"

  '';



  nixosInitrdRules = ''

    # Mark dm devices as db_persist so that they are kept active after switching root

    SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS+="db_persist"

  '';



  # Perform substitutions in all udev rules files.

  udevRulesFor = { name, udevPackages, udevPath, udev, systemd, binPackages, initrdBin ? null }: pkgs.runCommand name

    { preferLocalBuild = true;
@@ -364,8 +369,10 @@ in 
        EOF

      '';



    boot.initrd.services.udev.rules = nixosInitrdRules;



    boot.initrd.systemd.additionalUpstreamUnits = [

      # TODO: "initrd-udevadm-cleanup-db.service" is commented out because of https://github.com/systemd/systemd/issues/12953

      "initrd-udevadm-cleanup-db.service"

      "systemd-udevd-control.socket"

      "systemd-udevd-kernel.socket"

      "systemd-udevd.service"

nixos/modules/services/web-apps/mastodon.nix

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ in { 
          inherit (cfg) group;

        };

      })

      (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package mastodonEnv ])

      (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package mastodonEnv pkgs.imagemagick ])

    ];



    users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user;

nixos/modules/tasks/filesystems/ext.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,13 +3,14 @@ 
let



  inInitrd = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.initrd.supportedFilesystems;

  inSystem = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.supportedFilesystems;



in



{

  config = {



    system.fsPackages = lib.mkIf (config.boot.initrd.systemd.enable -> inInitrd) [ pkgs.e2fsprogs ];

    system.fsPackages = lib.mkIf (config.boot.initrd.systemd.enable -> (inInitrd || inSystem)) [ pkgs.e2fsprogs ];



    # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)

    boot.initrd.availableKernelModules = lib.mkIf (config.boot.initrd.systemd.enable -> inInitrd) [ "ext2" "ext4" ];

nixos/tests/hibernate.nix

+3 −2
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ let 


    powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service";



    fileSystems = {

      "/".device = "/dev/vda2";

    fileSystems."/" = {

      device = "/dev/vda2";

      fsType = "ext3";

    };

    swapDevices = mkOverride 0 [ { device = "/dev/vda1"; } ];

    boot.resumeDevice = mkIf systemdStage1 "/dev/vda1";