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

Merge master into staging-next

parents 946747ef 53e3474e

maintainers/maintainer-list.nix

+6 −6
Original line number Diff line number Diff line
@@ -20709,12 +20709,6 @@ 
    githubId = 131159000;

    name = "Nitin Passa";

  };

  twitchyliquid64 = {

    name = "Tom";

    email = "twitchyliquid64@ciphersink.net";

    github = "twitchyliquid64";

    githubId = 6328589;

  };

  twz123 = {

    name = "Tom Wieczorek";

    email = "tom@bibbu.net";
@@ -22305,6 +22299,12 @@ 
    githubId = 179548;

    name = "Yves Fischer";

  };

  YvesStraten = {

    email = "yves.straten@gmail.com";

    github = "YvesStraten";

    githubId = 65394961;

    name = "Yves Straten";

  };

  yvt = {

    email = "i@yvt.jp";

    github = "yvt";

maintainers/team-list.nix

+1 −3
Original line number Diff line number Diff line
@@ -263,9 +263,7 @@ with lib.maintainers; { 
  };



  docs = {

    members = [

      ryantm

    ];

    members = [ ];

    scope = "Maintain nixpkgs/NixOS documentation and tools for building it.";

    shortName = "Docs";

    enableFeatureFreezePing = true;

nixos/modules/services/networking/netbird/coturn.nix

+3 −3
Original line number Diff line number Diff line
@@ -148,10 +148,10 @@ in 
        allowedUDPPorts = cfg.openPorts;

        allowedTCPPorts = cfg.openPorts;



        allowedUDPPortRanges = [

        allowedUDPPortRanges = with config.services.coturn; [

          {

            from = cfg.minPort;

            to = cfg.maxPort;

            from = min-port;

            to = max-port;

          }

        ];

      };

nixos/modules/services/networking/tailscale.nix

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ let 
  cfg = config.services.tailscale;

  isNetworkd = config.networking.useNetworkd;

in {

  meta.maintainers = with maintainers; [ mbaillie twitchyliquid64 mfrw ];

  meta.maintainers = with maintainers; [ mbaillie mfrw ];



  options.services.tailscale = {

    enable = mkEnableOption "Tailscale client daemon";

pkgs/applications/audio/audacity/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -62,13 +62,13 @@ 


stdenv.mkDerivation rec {

  pname = "audacity";

  version = "3.5.0";

  version = "3.5.1";



  src = fetchFromGitHub {

    owner = "audacity";

    repo = "audacity";

    rev = "Audacity-${version}";

    hash = "sha256-vJhCONoEC4Bdd1ZOLLobjNgLb/DT6auuMGk8L9lj6TU=";

    hash = "sha256-wQ+K31TvDTVwDyVQ5nWgcneZ1cFxztmsbSXrDs33Uoc=";

  };



  postPatch = ''