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

Merge master into staging-nixos

parents 47e4c166 622f4ae1

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -29443,6 +29443,12 @@ 
    githubId = 8006928;

    name = "Yuannan (Brandon) Lin";

  };

  yujonpradhananga = {

    email = "yujonpradhan123@gmail.com";

    github = "Yujonpradhananga";

    githubId = 139200034;

    name = "Yujon Pradhananga";

  };

  yuka = {

    email = "yuka@yuka.dev";

    matrix = "@yuka:yuka.dev";

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

+0 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ 


- The packages `iw` and `wirelesstools` (`iwconfig`, `iwlist`, etc.) are no longer installed implicitly if wireless networking has been enabled.



- The Traefik module now features new ways to deploy the dynamic and static configuration files. Move your existing declarative static and dynamic configurations to `services.traefik.static.settings` and `services.traefik.dynamic.files."my-application".settings` respectively. The `services.traefik.dynamic.settings` option is available for a simpler migration without needing to define a filename like `my-application`, but this option will be removed in NixOS 26.11.



- `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a

package instead of attrs. Now, by default, nixpkgs.coredns in conjunction with dockerTools.buildImage is used, instead

of pulling the upstream container image from Docker Hub. If you want the old behavior, you can set:

nixos/modules/programs/starship.nix

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ in 
        if [[ ! -f "$HOME/.config/starship.toml" ]]; then

          export STARSHIP_CONFIG=${settingsFile}

        fi

        eval "$(${cfg.package}/bin/starship init bash)"

        eval "$(${cfg.package}/bin/starship init bash --print-full-init)"

      fi

    '';

nixos/modules/services/misc/omnom.nix

+12 −0
Original line number Diff line number Diff line
@@ -92,6 +92,18 @@ in 
                  "127.0.0.1:''${config.services.omnom.port}"

                '';

              };

              # NOTE: this can't be empty, because it will be overwritten by

              # Omnom's internal default config.

              base_url = lib.mkOption {

                type = lib.types.str;

                internal = true;

                default = "http://127.0.0.1:${toString cfg.port}/";

                description = "Full server URL.";

                example = "https://local.omnom/xy/";

                defaultText = lib.literalExpression ''

                  "http://''${config.services.omnom.settings.server.address}/"

                '';

              };

              secure_cookie = lib.mkOption {

                type = lib.types.bool;

                default = true;

nixos/modules/services/networking/pangolin.nix

+10 −7
Original line number Diff line number Diff line
@@ -201,11 +201,14 @@ in 
          isSystemUser = true;

        };

      };

      groups.fossorial.members = [

      groups.fossorial = {

        members = [

          "pangolin"

          "gerbil"

          "traefik"

        ];

      };

    };

    # order is as follows

    # "pangolin.service"

    # "gerbil.service"
@@ -428,9 +431,9 @@ in 


    services.traefik = {

      enable = true;

      supplementaryGroups = [ "fossorial" ];

      group = "fossorial";

      dataDir = "${cfg.dataDir}/config/traefik";

      static.settings = {

      staticConfigOptions = {

        providers.http = {

          endpoint = "http://localhost:${toString finalSettings.server.internal_port}/api/v1/traefik-config";

          pollInterval = "5s";
@@ -468,7 +471,7 @@ in 
          };

        };

      };

      dynamic.files."pangolin".settings = {

      dynamicConfigOptions = {

        http = {

          middlewares.redirect-to-https.redirectScheme.scheme = "https";

          routers = {