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

Merge master into staging-next

parents 41bc7222 9ceb0b0d

doc/hooks/desktop-file-utils.section.md

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# desktop-file-utils {#desktop-file-utils}



This setup hook removes the MIME cache (located at `$out/share/applications/mimeinfo.cache`) in the `preFixupPhase`.



This hook is necessary because `mimeinfo.cache` can be created when a package uses `desktop-file-utils`, resulting in collisions if multiple packages are installed that contain this file (as in [#48295](https://github.com/NixOS/nixpkgs/issues/48295)).

doc/hooks/index.md

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ bmake.section.md 
breakpoint.section.md

cernlib.section.md

cmake.section.md

desktop-file-utils.section.md

gdk-pixbuf.section.md

ghc.section.md

gnome.section.md

nixos/modules/services/networking/quorum.nix

+2 −2
Original line number Diff line number Diff line
@@ -201,11 +201,11 @@ in { 
            --syncmode ${cfg.syncmode} \

            ${optionalString (cfg.permissioned)

            "--permissioned"} \

            --mine --minerthreads 1 \

            --mine --miner.threads 1 \

            ${optionalString (cfg.rpc.enable)

            "--rpc --rpcaddr ${cfg.rpc.address} --rpcport ${toString cfg.rpc.port} --rpcapi ${cfg.rpc.api}"} \

            ${optionalString (cfg.ws.enable)

            "--ws --wsaddr ${cfg.ws.address} --wsport ${toString cfg.ws.port} --wsapi ${cfg.ws.api} --wsorigins ${cfg.ws.origins}"} \

            "--ws --ws.addr ${cfg.ws.address} --ws.port ${toString cfg.ws.port} --ws.api ${cfg.ws.api} --ws.origins ${cfg.ws.origins}"} \

            --emitcheckpoints \

            --datadir ${dataDir} \

            --port ${toString cfg.port}'';

nixos/modules/services/web-servers/nginx/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ in 
      typesHashMaxSize = mkOption {

        type = types.ints.positive;

        default = if cfg.defaultMimeTypes == "${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024;

        defaultText = literalExpression ''if cfg.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024'';

        defaultText = literalExpression ''if config.services.nginx.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024'';

        description = ''

          Sets the maximum size of the types hash tables (`types_hash_max_size`).

          It is recommended that the minimum size possible size is used.

nixos/tests/dnsdist.nix

+4 −1
Original line number Diff line number Diff line
@@ -64,7 +64,10 @@ in 
        networking.firewall.allowedTCPPorts = [ 443 ];

        networking.firewall.allowedUDPPorts = [ 443 ];

        services.dnsdist.dnscrypt.enable = true;

        services.dnsdist.dnscrypt.providerKey = "${./dnscrypt-wrapper/secret.key}";

        services.dnsdist.dnscrypt.providerKey = pkgs.runCommand "dnscrypt-secret.key" {} ''

          echo 'R70+xqm7AaDsPtDgpSjSG7KHvEqVf6u6PZ+E3cGPbOwUQdg6/

                RIIpK6pHkINhrv7nxwIG5c7b/m5NJVT3A1AXQ==' | base64 -id > "$out"

        '';

      }

    ];