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

Merge master into staging-nixos

parents e0e87115 f0a33ba8

ci/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ let 
          };

        };

        settings.formatter.yamlfmt.excludes = [

          # Breaks helm templating

          "nixos/tests/k3s/k3s-test-chart/templates/*"

          # Aligns comments with whitespace

          "pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml"

          # TODO: Fix formatting for auto-generated file

maintainers/github-teams.json

+1 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ 
      "wrmilling": 6162814

    },

    "members": {

      "azey7f": 41077433,

      "frederictobiasc": 26125115,

      "heywoodlh": 18178614,

      "rorosen": 76747196

nixos/modules/services/continuous-integration/jenkins/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -290,4 +290,8 @@ in 
      };

    };

  };



  meta.maintainers = with lib.maintainers; [

    felixsinger

  ];

}

nixos/modules/services/networking/knot-resolver.nix

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ in 
        If you want to use knot-resolver 5, please use services.kresd.

      '';

    };

    package = lib.mkPackageOption pkgs "knot-resolver_6" {

    package = lib.mkPackageOption pkgs "knot-resolver-manager_6.knot-resolver" {

      example = "knot-resolver_6.override { extraFeatures = true; }";

    };

    managerPackage = lib.mkPackageOption pkgs "knot-resolver-manager_6" { };

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ in 


      # Default services

      services.blueman.enable = mkDefault (notExcluded pkgs.blueman);

      services.hardware.bolt.enable = mkDefault (notExcluded pkgs.bolt);

      hardware.bluetooth.enable = mkDefault true;

      security.polkit.enable = true;

      services.accounts-daemon.enable = true;
@@ -173,6 +174,7 @@ in 
            cinnamon-translations



            # utils needed by some scripts

            inxi

            killall



            # session requirements