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

Merge master into staging-nixos

parents 3aa6fb18 dbff0491

nixos/modules/programs/zsh/oh-my-zsh.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ let 
      env = pkgs.buildEnv {

        name = "zsh-${name}-env";

        paths = cfg.customPkgs;

        pathsToLink = "/share/zsh/${dir}";

        pathsToLink = [ "/share/zsh/${dir}" ];

      };

    in

    {

nixos/modules/services/networking/wireguard-networkd.nix

+7 −5
Original line number Diff line number Diff line
@@ -77,7 +77,9 @@ let 
      PersistentKeepalive = peer.persistentKeepalive;

    };



  generateNetwork = name: interface: {

  generateNetwork =

    name: interface:

    nameValuePair "40-${name}" {

      matchConfig.Name = name;

      address = interface.ips;

    };
@@ -236,7 +238,7 @@ in 
    systemd.network = {

      enable = true;

      netdevs = mapAttrs' generateNetdev cfg.interfaces;

      networks = mapAttrs generateNetwork cfg.interfaces;

      networks = mapAttrs' generateNetwork cfg.interfaces;

    };



    environment.etc = mapAttrs' generateRefreshNetdevMode refreshEnabledInterfaces;

nixos/modules/services/torrent/qbittorrent.nix

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ let 
    mkIf

    maintainers

    escape

    replaceString

    collect

    mapAttrsRecursive

    optionals
@@ -43,7 +44,9 @@ let 
          collect isString (

            mapAttrsRecursive (

              path: value:

              "${escape [ sep ] (concatStringsSep "\\" ([ k ] ++ path))}${sep}${mkValueStringDefault { } value}"

              "${escape [ sep ] (concatStringsSep "\\" ([ k ] ++ path))}${sep}${

                replaceString "\n" "\\n" (mkValueStringDefault { } value)

              }"

            ) v

          )

        )

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

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ in 
              root * ${cfg.ui.package}/dist

              file_server

            }

            handle_path /static/${cfg.ui.package.passthru.commit_sha}/* {

            handle_path /static/${cfg.ui.package.version}/* {

              root * ${cfg.ui.package}/dist

              file_server

            }

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

+2 −2
Original line number Diff line number Diff line
@@ -331,10 +331,10 @@ in 
                proxy_buffering off;

                proxy_request_buffering off;

              ''

              + lib.optionalString (lib.elem "brotli" config.services.nginx.additionalModules) ''

              + lib.optionalString (lib.any (m: m.name == "brotli") config.services.nginx.additionalModules) ''

                brotli off;

              ''

              + lib.optionalString (lib.elem "zstd" config.services.nginx.additionalModules) ''

              + lib.optionalString (lib.any (m: m.name == "zstd") config.services.nginx.additionalModules) ''

                zstd off;

              '';

            };