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

Merge master into staging-next

parents be5a2b40 c65a2a6c

lib/modules.nix

+8 −8
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ let 
    defsFinal' =

      let

        # Process mkMerge and mkIf properties.

        defs' = concatMap (

        defsNormalized = concatMap (

          m:

          map (

            value:
@@ -1146,19 +1146,19 @@ let 
        ) defs;



        # Process mkOverride properties.

        defs'' = filterOverrides' defs';

        defsFiltered = filterOverrides' defsNormalized;



        # Sort mkOrder properties.

        defs''' =

        defsSorted =

          # Avoid sorting if we don't have to.

          if any (def: def.value._type or "" == "order") defs''.values then

            sortProperties defs''.values

          if any (def: def.value._type or "" == "order") defsFiltered.values then

            sortProperties defsFiltered.values

          else

            defs''.values;

            defsFiltered.values;

      in

      {

        values = defs''';

        inherit (defs'') highestPrio;

        values = defsSorted;

        inherit (defsFiltered) highestPrio;

      };

    defsFinal = defsFinal'.values;

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

+2 −0
Original line number Diff line number Diff line
@@ -330,6 +330,8 @@ 
- `services.varnish.http_address` has been superseeded by `services.varnish.listen` which is now

  structured config for all of varnish's `-a` variations.



- `services.nginx.recommendedProxySettings` now sets `X-Forwarded-Server` to the hostname of nginx instead of the original host.



- [](#opt-services.gnome.gnome-keyring.enable) does not ship with an SSH agent anymore, as this is now handled by the `gcr_4` package instead of `gnome-keyring`. A new module has been added to support this, under [](#opt-services.gnome.gcr-ssh-agent.enable) (its default value has been set to [](#opt-services.gnome.gnome-keyring.enable) to ensure a smooth transition). See the [relevant upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67) for more details.



- The `nettools` package (ifconfig, arp, mii-tool, netstat, route) is not installed by default anymore. The suite is unmaintained and users should migrate to `iproute2` and `ethtool` instead.

nixos/modules/services/networking/mosquitto.nix

+1 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ let 
    pid_file = 1;

    queue_qos0_messages = 1;

    retain_available = 1;

    retain_expiry_interval = 1;

    set_tcp_nodelay = 1;

    sys_interval = 1;

    upgrade_outgoing_qos = 1;

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

+13 −1
Original line number Diff line number Diff line
@@ -39,6 +39,18 @@ in 
      };

    };



    extraOptions = lib.mkOption {

      type = lib.types.listOf lib.types.str;

      default = [ ];

      example = [

        "--log-level"

        "debug"

      ];

      description = ''

        Specifies extra command line arguments to pass to mealie (Gunicorn).

      '';

    };



    credentialsFile = lib.mkOption {

      type = with lib.types; nullOr path;

      default = null;
@@ -84,7 +96,7 @@ in 
        DynamicUser = true;

        User = "mealie";

        ExecStartPre = "${pkg}/libexec/init_db";

        ExecStart = "${lib.getExe pkg} -b ${cfg.listenAddress}:${builtins.toString cfg.port}";

        ExecStart = "${lib.getExe pkg} -b ${cfg.listenAddress}:${builtins.toString cfg.port} ${lib.escapeShellArgs cfg.extraOptions}";

        EnvironmentFile = lib.mkIf (cfg.credentialsFile != null) cfg.credentialsFile;

        StateDirectory = "mealie";

        StandardOutput = "journal";

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

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,6 @@ in 
            FORCE_HTTPS = builtins.toString cfg.forceHttps;

            ENABLE_UPDATES = builtins.toString cfg.enableUpdateCheck;

            WEB_CONCURRENCY = builtins.toString cfg.concurrency;

            MAXIMUM_IMPORT_SIZE = builtins.toString cfg.maximumImportSize;

            DEBUG = cfg.debugOutput;

            GOOGLE_ANALYTICS_ID = lib.optionalString (cfg.googleAnalyticsId != null) cfg.googleAnalyticsId;

            SENTRY_DSN = lib.optionalString (cfg.sentryDsn != null) cfg.sentryDsn;
@@ -715,6 +714,7 @@ in 
            RATE_LIMITER_DURATION_WINDOW = builtins.toString cfg.rateLimiter.durationWindow;



            FILE_STORAGE = cfg.storage.storageType;

            FILE_STORAGE_IMPORT_MAX_SIZE = builtins.toString cfg.maximumImportSize;

            FILE_STORAGE_UPLOAD_MAX_SIZE = builtins.toString cfg.storage.uploadMaxSize;

            FILE_STORAGE_LOCAL_ROOT_DIR = cfg.storage.localRootDir;

          }