Unverified Commit ee537d78 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 239638ed 1fa09357

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ 


- `pocket-id` has been updated to version 2 that contains [breaking changes](https://pocket-id.org/docs/setup/major-releases/migrate-v2).



- `services.xserver` will now throw an error if an X11 driver specified in  `videoDriver(s)` cannot be found. Previously, unknown drivers would be silently ignored.



- `asio` (standalone version of `boost::asio`) has been updated from 1.24.0 to 1.36.0. Some breaking changes were introduced between these

  two versions, and the one affected most was the removal of `asio::io_service` in favor of `asio::io_context` in 1.33.0. `asio_1_32_0` is

  retained for packages that have not completed migration. `asio_1_10` has been removed as no packages depend on it anymore.

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -12593,6 +12593,12 @@ 
    githubId = 43830312;

    name = "Joël Miramon";

  };

  jmmv = {

    email = "julio@meroh.net";

    github = "jmmv";

    githubId = 879272;

    name = "Julio Merino";

  };

  jn-sena = {

    email = "jn-sena@proton.me";

    github = "jn-sena";

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1515,6 +1515,7 @@ 
  ./services/security/reaction.nix

  ./services/security/shibboleth-sp.nix

  ./services/security/sks.nix

  ./services/security/ssh-agent-switcher.nix

  ./services/security/sshguard.nix

  ./services/security/sslmate-agent.nix

  ./services/security/step-ca.nix

nixos/modules/services/misc/autosuspend.nix

+8 −10
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ let 


  # Dependencies needed by specific checks

  dependenciesForChecks = {

    "Ping" = [ pkgs.iputils ];

    "Smb" = pkgs.samba;

    "XIdleTime" = [

      pkgs.xprintidle
@@ -225,6 +226,13 @@ in 
  };



  config = mkIf cfg.enable {

    assertions = [

      {

        assertion = cfg.checks != { };

        message = "`services.autosuspend.checks` must contain at least one activity check.";

      }

    ];



    systemd.services.autosuspend = {

      description = "A daemon to suspend your server in case of inactivity";

      documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ];
@@ -235,16 +243,6 @@ in 
        ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon";

      };

    };



    systemd.services.autosuspend-detect-suspend = {

      description = "Notifies autosuspend about suspension";

      documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ];

      wantedBy = [ "sleep.target" ];

      after = [ "sleep.target" ];

      serviceConfig = {

        ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} presuspend";

      };

    };

  };



  meta = {

nixos/modules/services/monitoring/prometheus/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ let 
    ++ (

      if (cfg.enableAgentMode) then

        [

          "--enable-feature=agent"

          "--agent"

        ]

      else

        [