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

Merge master into staging-next

parents b34f222b 174bd27e

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -5177,6 +5177,11 @@ 
    githubId = 1583484;

    name = "Andrey Golovizin";

  };

  errnoh = {

    github = "errnoh";

    githubId = 373946;

    name = "Erno Hopearuoho";

  };

  ersin = {

    email = "me@ersinakinci.com";

    github = "ersinakinci";
@@ -11102,6 +11107,12 @@ 
    github = "michaelCTS";

    githubId = 132582212;

  };

  michaeldonovan = {

    email = "michael@mdonovan.dev";

    name = "Michael Donovan";

    github = "michaeldonovan";

    githubId = 14077230;

  };

  michaelgrahamevans = {

    email = "michaelgrahamevans@gmail.com";

    name = "Michael Evans";

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

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


- [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable).



- [Jool](https://nicmx.github.io/Jool/en/index.html), an Open Source implementation of IPv4/IPv6 translation on Linux. Available as [networking.jool.enable](#opt-networking.jool.enable).



- [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services.



- [pgBouncer](https://www.pgbouncer.org), a PostgreSQL connection pooler. Available as [services.pgbouncer](#opt-services.pgbouncer.enable).

nixos/modules/module-list.nix

+2 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ 
  ./services/audio/botamusique.nix

  ./services/audio/gmediarender.nix

  ./services/audio/gonic.nix

  ./services/audio/goxlr-utility.nix

  ./services/audio/hqplayerd.nix

  ./services/audio/icecast.nix

  ./services/audio/jack.nix
@@ -928,6 +929,7 @@ 
  ./services/networking/jibri/default.nix

  ./services/networking/jicofo.nix

  ./services/networking/jitsi-videobridge.nix

  ./services/networking/jool.nix

  ./services/networking/kea.nix

  ./services/networking/keepalived/default.nix

  ./services/networking/keybase.nix

nixos/modules/programs/htop.nix

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ let 
  fmt = value:

    if isList value then concatStringsSep " " (map fmt value) else

    if isString value then value else

    if isBool value || isInt value then toString value else

    if isBool value then if value then "1" else "0" else

    if isInt value then toString value else

    throw "Unrecognized type ${typeOf value} in htop settings";



in

nixos/modules/services/audio/goxlr-utility.nix

0 → 100644
+48 −0
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:



let

  cfg = config.services.goxlr-utility;

in



with lib;

{



  options = {

    services.goxlr-utility = {

      enable = mkOption {

        default = false;

        type = types.bool;

        description = lib.mdDoc ''

          Whether to enable goxlr-utility for controlling your TC-Helicon GoXLR or GoXLR Mini

        '';

      };

      package = mkPackageOptionMD pkgs "goxlr-utility" { };

      autoStart.xdg = mkOption {

        default = true;

        type = with types; bool;

        description = lib.mdDoc ''

          Start the daemon automatically using XDG autostart.

          Sets `xdg.autostart.enable = true` if not already enabled.

        '';

      };

    };

  };



  config = mkIf config.services.goxlr-utility.enable

    {

      services.udev.packages = [ cfg.package ];



      xdg.autostart.enable = mkIf cfg.autoStart.xdg true;

      environment.systemPackages = mkIf cfg.autoStart.xdg

        [

          cfg.package

          (pkgs.makeAutostartItem

            {

              name = "goxlr-utility";

              package = cfg.package;

            })

        ];

    };



  meta.maintainers = with maintainers; [ errnoh ];

}