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

Merge master into staging-nixos

parents 7155128b a100b0f0

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -7023,6 +7023,13 @@ 
    name = "Will Dietz";

    keys = [ { fingerprint = "389A 78CB CD88 5E0C 4701  DEB9 FD42 C7D0 D414 94C8"; } ];

  };

  dudeofawesome = {

    email = "tourist-04.iced@icloud.com";

    github = "dudeofawesome";

    githubId = 1683595;

    name = "Louis Orleans";

    keys = [ { fingerprint = "llSOkL8Tn5+LOmWa4PDci+dQXZIRy11NSumDiFzNkAM"; } ];

  };

  dudymas = {

    email = "jeremy.white@cloudposse.com";

    github = "dudymas";

nixos/modules/services/cluster/kubernetes/kubelet.nix

+1 −3
Original line number Diff line number Diff line
@@ -108,9 +108,7 @@ let 
      };

    };



  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (

    mapAttrsToList (n: v: v) cfg.taints

  );

  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (attrValues cfg.taints);

in

{

  imports = [

nixos/modules/services/databases/pgbouncer.nix

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ in 
        User = cfg.user;

        Group = cfg.group;

        ExecStart = utils.escapeSystemdExecArgs [

          (lib.getExe pkgs.pgbouncer)

          (lib.getExe cfg.package)

          "/etc/${configPath}"

        ];

        RuntimeDirectory = "pgbouncer";

nixos/modules/services/hardware/buffyboard.nix

+16 −1
Original line number Diff line number Diff line
@@ -109,6 +109,22 @@ in 
              This has a negative performance impact.

            '';

          };

          options.quirks.ignore_unused_terminals = mkOption {

            type = types.nullOr types.bool;

            default = null;

            description = ''

              If true, buffyboard won't automatically update the layout of a new terminal and

              draw the keyboard, if the terminal is not opened by any process. In this case

              SIGUSR1 should be sent to buffyboard to update the layout. This quirk was introduced

              to resolve a race between buffyboard and systemd-logind according to the following scenario:

              - A user switches to a new virtual terminal

              - Buffyboard opens the terminal and changes the number of rows

              - systemd-logind sees that the terminal is opened by some other process and don't start getty@.service



              The race is resolved by enabling this option and installing a drop-in file

              for getty@.service that sends SIGUSR1 to buffyboard.

            '';

          };

        };

        default = { };

      };
@@ -132,7 +148,6 @@ in 
        ))

      ];

      wantedBy = [ "getty.target" ];

      before = [ "getty.target" ];

    };

  };

}

nixos/modules/services/monitoring/karma.nix

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ in 
        Type = "simple";

        DynamicUser = true;

        Restart = "on-failure";

        ExecStart = "${pkgs.karma}/bin/karma --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";

        ExecStart = "${lib.getExe cfg.package} --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";

      };

    };

    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.listen.port ];