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

Merge master into staging-next

parents 73cdc95d 5b916fd8

doc/stdenv/platform-notes.chapter.md

+276 −217

File changed.

Preview size limit exceeded, changes collapsed.

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -12543,6 +12543,12 @@ 
    githubId = 40217331;

    name = "LizeLive";

  };

  llakala = {

    email = "elevenaka11@gmail.com";

    github = "llakala";

    githubId = 78693624;

    name = "llakala";

  };

  lluchs = {

    email = "lukas.werling@gmail.com";

    github = "lluchs";
@@ -21896,6 +21902,12 @@ 
    githubId = 1391883;

    name = "Tom Hall";

  };

  thtrf = {

    email = "thtrf@proton.me";

    github = "thtrf";

    githubId = 82712122;

    name = "thtrf";

  };

  Thunderbottom = {

    email = "chinmaydpai@gmail.com";

    github = "Thunderbottom";

nixos/modules/programs/localsend.nix

+9 −4
Original line number Diff line number Diff line
@@ -12,14 +12,19 @@ in 
  options.programs.localsend = {

    enable = lib.mkEnableOption "localsend, an open source cross-platform alternative to AirDrop";



    openFirewall = lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files" // {

    package = lib.mkPackageOption pkgs "localsend" { };



    openFirewall =

      lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files"

      // {

        default = true;

      };

  };



  config = lib.mkIf cfg.enable {

    environment.systemPackages = [ pkgs.localsend ];

    environment.systemPackages = [ cfg.package ];

    networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ firewallPort ];

    networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ firewallPort ];

  };



  meta.maintainers = with lib.maintainers; [ pandapip1 ];

nixos/modules/programs/openvpn3.nix

+6 −1
Original line number Diff line number Diff line
@@ -101,7 +101,12 @@ in { 
      };

    };



    systemd.packages = [ cfg.package ];

    systemd = {

      packages = [ cfg.package ];

      tmpfiles.rules = [

        "d /etc/openvpn3/configs 0750 openvpn openvpn - -"

      ];

    };

  };



  meta.maintainers = with lib.maintainers; [ shamilton progrm_jarvis ];

nixos/modules/services/monitoring/teamviewer.nix

+13 −20
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:



with lib;



let



  cfg = config.services.teamviewer;



in



{



  ###### interface



  options = {



    services.teamviewer.enable = mkEnableOption "TeamViewer daemon";



    services.teamviewer = {

      enable = lib.mkEnableOption "TeamViewer daemon & system package";

      package = lib.mkPackageOption pkgs "teamviewer" { };

    };

  };



  ###### implementation



  config = mkIf (cfg.enable) {



    environment.systemPackages = [ pkgs.teamviewer ];

  config = lib.mkIf (cfg.enable) {

    environment.systemPackages = [ cfg.package ];



    services.dbus.packages = [ pkgs.teamviewer ];

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



    systemd.services.teamviewerd = {

      description = "TeamViewer remote control daemon";



      wantedBy = [ "multi-user.target" ];

      wants = [ "network-online.target" ];

      after = [ "network-online.target" "network.target" "dbus.service" ];

      after = [

        "network-online.target"

        "network.target"

        "dbus.service"

      ];

      requires = [ "dbus.service" ];

      preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer";
@@ -39,12 +33,11 @@ in 
      startLimitBurst = 10;

      serviceConfig = {

        Type = "simple";

        ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -f";

        ExecStart = "${cfg.package}/bin/teamviewerd -f";

        PIDFile = "/run/teamviewerd.pid";

        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

        Restart = "on-abort";

      };

    };

  };



}