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

Merge master into staging-next

parents 17237659 3be507be

maintainers/maintainer-list.nix

+39 −0
Original line number Diff line number Diff line
@@ -1448,6 +1448,12 @@ 
    githubId = 5411704;

    name = "Manuel Sanchez Pinar";

  };

  aos = {

    email = "n@aos.sh";

    github = "aos";

    githubId = 25783780;

    name = "aos";

  };

  apeschar = {

    email = "albert@peschar.net";

    github = "apeschar";
@@ -5792,6 +5798,15 @@ 
    githubId = 4576666;

    name = "Eliza Velasquez";

  };

  eljamm = {

    name = "Fedi Jamoussi";

    email = "fedi.jamoussi@protonmail.ch";

    github = "eljamm";

    githubId = 83901271;

    keys = [{

      fingerprint = "FF59 E027 4EE2 E792 512B  BDC8 7630 FDF7 C8FB 1F3F";

    }];

  };

  elkowar = {

    email = "thereal.elkowar@gmail.com";

    github = "elkowar";
@@ -7791,6 +7806,12 @@ 
    github = "HannahMR";

    githubId = 9088467;

  };

  hannesgith = {

    email = "nix@h-h.win";

    github = "hannesgith";

    githubId = 33062605;

    name = "Hannes Hattenbach";

  };

  hansjoergschurr = {

    email = "commits@schurr.at";

    github = "hansjoergschurr";
@@ -15846,6 +15867,13 @@ 
    githubId = 4056630;

    name = "Patrick Steinhardt";

  };

  pkulak = {

    name = "Phil Kulak";

    email = "phil@kulak.us";

    matrix = "@phil:kulak.us";

    github = "pkulak";

    githubId = 502905;

  };

  plabadens = {

    name = "Pierre Labadens";

    email = "labadens.pierre+nixpkgs@gmail.com";
@@ -16512,6 +16540,11 @@ 
    githubId = 35229674;

    name = "Armin Rothfuss";

  };

  r3n3gad3p3arl = {

    github = "r3n3gad3p3arl";

    githubId = 20760527;

    name = "Madelyn";

  };

  raboof = {

    email = "arnout@bzzt.net";

    matrix = "@raboof:matrix.org";
@@ -16815,6 +16848,12 @@ 
    githubId = 18155001;

    name = "Gabe Dunn";

  };

  redyf = {

    email = "mateusalvespereira7@gmail.com";

    github = "redyf";

    githubId = 98139059;

    name = "Mateus Alves";

  };

  reedrw = {

    email = "reedrw5601@gmail.com";

    github = "reedrw";

nixos/doc/manual/release-notes/rl-2405.section.md

+4 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- [mautrix-meta](https://github.com/mautrix/meta), a Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge. Available as services.mautrix-meta



- [Jottacloud Command-line Tool](https://docs.jottacloud.com/en/articles/1436834-jottacloud-command-line-tool), a CLI for the [Jottacloud](https://jottacloud.com/) cloud storage provider. Available as [user.services.jotta-cli](#opt-user.services.jotta-cli.enable).



- [transfer-sh](https://github.com/dutchcoders/transfer.sh), a tool that supports easy and fast file sharing from the command-line. Available as [services.transfer-sh](#opt-services.transfer-sh.enable).



- [FCast Receiver](https://fcast.org), an open-source alternative to Chromecast and AirPlay. Available as [programs.fcast-receiver](#opt-programs.fcast-receiver.enable).
@@ -398,6 +400,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- `services.zope2` has been removed as `zope2` is unmaintained and was relying on Python2.



- `services.oauth2_proxy` was renamed to `services.oauth2-proxy`. Also the corresponding service, user and group were renamed.



- `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively.

  Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts.

nixos/modules/module-list.nix

+3 −2
Original line number Diff line number Diff line
@@ -1029,6 +1029,7 @@ 
  ./services/networking/jigasi.nix

  ./services/networking/jitsi-videobridge.nix

  ./services/networking/jool.nix

  ./services/networking/jotta-cli.nix

  ./services/networking/kea.nix

  ./services/networking/keepalived/default.nix

  ./services/networking/keybase.nix
@@ -1256,8 +1257,8 @@ 
  ./services/security/kanidm.nix

  ./services/security/munge.nix

  ./services/security/nginx-sso.nix

  ./services/security/oauth2_proxy.nix

  ./services/security/oauth2_proxy_nginx.nix

  ./services/security/oauth2-proxy.nix

  ./services/security/oauth2-proxy-nginx.nix

  ./services/security/opensnitch.nix

  ./services/security/pass-secret-service.nix

  ./services/security/physlock.nix

nixos/modules/services/backup/znapzend.nix

+10 −0
Original line number Diff line number Diff line
@@ -315,6 +315,14 @@ in 
        '';

      };



      mailErrorSummaryTo = mkOption {

        type = singleLineStr;

        default = "";

        description = ''

          Email address to send a summary to if "send task(s) failed".

        '';

      };



      noDestroy = mkOption {

        type = bool;

        default = false;
@@ -455,6 +463,8 @@ in 
              "--loglevel=${cfg.logLevel}"

              (optionalString cfg.noDestroy "--nodestroy")

              (optionalString cfg.autoCreation "--autoCreation")

              (optionalString (cfg.mailErrorSummaryTo != "")

                "--mailErrorSummaryTo=${cfg.mailErrorSummaryTo}")

              (optionalString (enabledFeatures != [])

                "--features=${concatStringsSep "," enabledFeatures}")

            ]; in "${pkgs.znapzend}/bin/znapzend ${args}";

nixos/modules/services/monitoring/parsedmarc.nix

+4 −4
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ in 
              description = ''

                The addresses to send outgoing mail to.

              '';

              apply = x: if x == [] then null else lib.concatStringsSep "," x;

              apply = x: if x == [] || x == null then null else lib.concatStringsSep "," x;

            };

          };
@@ -438,7 +438,7 @@ in 
            ];

        dashboards.settings.providers = lib.mkIf cfg.provision.grafana.dashboard [{

          name = "parsedmarc";

          options.path = "${pkgs.python3Packages.parsedmarc.dashboard}";

          options.path = "${pkgs.parsedmarc.dashboard}";

        }];

      };

    };
@@ -446,7 +446,7 @@ in 
    services.parsedmarc.settings = lib.mkMerge [

      (lib.mkIf cfg.provision.elasticsearch {

        elasticsearch = {

          hosts = [ "localhost:9200" ];

          hosts = [ "http://localhost:9200" ];

          ssl = false;

        };

      })
@@ -530,7 +530,7 @@ in 
            MemoryDenyWriteExecute = true;

            LockPersonality = true;

            SystemCallArchitectures = "native";

            ExecStart = "${pkgs.python3Packages.parsedmarc}/bin/parsedmarc -c /run/parsedmarc/parsedmarc.ini";

            ExecStart = "${lib.getExe pkgs.parsedmarc} -c /run/parsedmarc/parsedmarc.ini";

          };

        };