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

Merge master into staging-next

parents e2cad4ea 89b61a4c

maintainers/maintainer-list.nix

+12 −6
Original line number Diff line number Diff line
@@ -4127,12 +4127,6 @@ 
    githubId = 486199;

    name = "Colin";

  };

  c0bw3b = {

    email = "c0bw3b@gmail.com";

    github = "c0bw3b";

    githubId = 24417923;

    name = "Renaud";

  };

  c0deaddict = {

    email = "josvanbakel@protonmail.com";

    github = "c0deaddict";
@@ -13586,6 +13580,12 @@ 
    github = "karantan";

    githubId = 7062631;

  };

  karaolidis = {

    name = "Nikolaos Karaolidis";

    email = "nick@karaolidis.com";

    github = "karaolidis";

    githubId = 46189100;

  };

  KarlJoad = {

    email = "karl@hallsby.com";

    github = "KarlJoad";
@@ -26308,6 +26308,12 @@ 
    github = "teczito";

    githubId = 15378834;

  };

  teeco123 = {

    name = "Kacper Gajko";

    email = "kacper.gajko1@icloud.com";

    github = "teeco123";

    githubId = 116846689;

  };

  teh = {

    email = "tehunger@gmail.com";

    github = "teh";

nixos/modules/security/tpm2.nix

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ in 
        environment.etc."tpm2-tss/fapi-config.json".source = fapiConfig;

        systemd.tmpfiles.rules = [

          "d ${cfg.fapi.logDir} 2750 ${cfg.tssUser} ${cfg.tssGroup} -"

          "d ${cfg.fapi.systemDir} 2750 root ${cfg.tssGroup} -"

          "d ${cfg.fapi.systemDir} 2770 root ${cfg.tssGroup} -"

        ];

      }

    ]

nixos/modules/services/continuous-integration/jenkins/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ in 


      package = lib.mkPackageOption pkgs "jenkins" { };



      javaPackage = lib.mkPackageOption pkgs "jdk21" { };

      javaPackage = lib.mkPackageOption pkgs "jdk25" { };



      packages = lib.mkOption {

        default = [

          pkgs.stdenv

          pkgs.git

          pkgs.jdk21

          pkgs.jdk25

          config.programs.ssh.package

          pkgs.nix

        ];

nixos/modules/services/mail/rspamd.nix

+13 −1
Original line number Diff line number Diff line
@@ -383,6 +383,18 @@ in 
        '';

      };



      extraArgs = mkOption {

        type = types.listOf types.str;

        default = [ ];

        example = [

          "--var=RBL_API_KEY=\${RBL_API_KEY}"

        ];

        description = ''

          A list of extra command line arguments to pass to rspamd.

          Check `rspamd --help` for possible arguments.

        '';

      };



      user = mkOption {

        type = types.str;

        default = "rspamd";
@@ -478,7 +490,7 @@ in 
      restartTriggers = [ rspamdDir ];



      serviceConfig = {

        ExecStart = "${cfg.package}/bin/rspamd ${optionalString cfg.debug "-d"} -c /etc/rspamd/rspamd.conf -f";

        ExecStart = "${cfg.package}/bin/rspamd ${optionalString cfg.debug "-d"} ${escapeShellArgs cfg.extraArgs} -c /etc/rspamd/rspamd.conf -f";

        Restart = "always";



        User = "${cfg.user}";

nixos/modules/services/video/frigate.nix

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ in 
              nginxAuthRequest

              + nginxProxySettings

              + ''

                limit_except GET {

                limit_except POST {

                    deny  all;

                }

              '';