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

Merge master into staging-next

parents 94e79f47 3ec512f9

lib/licenses.nix

+6 −0
Original line number Diff line number Diff line
@@ -796,6 +796,12 @@ lib.mapAttrs mkLicense ( 
      free = false;

    };



    intel-eula = {

      fullName = "Intel End User License Agreement for Developer Tools";

      url = "https://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/WordDocuments/intelamtsdklicense.htm";

      free = false;

    };



    interbase = {

      spdxId = "Interbase-1.0";

      fullName = "Interbase Public License v1.0";

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -26044,6 +26044,12 @@ 
    githubId = 1761259;

    name = "Eric Roberts";

  };

  thrix = {

    email = "mvadkert@redhat.com";

    github = "thrix";

    githubId = 633969;

    name = "Miroslav Vadkerti";

  };

  thtrf = {

    email = "thtrf@proton.me";

    github = "thtrf";

nixos/modules/programs/kdeconnect.nix

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
      implementation if you use Gnome

    '';

    package = lib.mkPackageOption pkgs [ "kdePackages" "kdeconnect-kde" ] {

      nullable = true;

      example = "gnomeExtensions.gsconnect";

    };

  };
@@ -24,7 +25,7 @@ 
      cfg = config.programs.kdeconnect;

    in

    lib.mkIf cfg.enable {

      environment.systemPackages = [

      environment.systemPackages = lib.optional (cfg.package != null) [

        cfg.package

      ];

      networking.firewall = rec {

nixos/modules/services/monitoring/vnstat.nix

+3 −2
Original line number Diff line number Diff line
@@ -10,11 +10,12 @@ in 
{

  options.services.vnstat = {

    enable = lib.mkEnableOption "update of network usage statistics via vnstatd";

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

  };



  config = lib.mkIf cfg.enable {



    environment.systemPackages = [ pkgs.vnstat ];

    environment.systemPackages = [ cfg.package ];



    users = {

      groups.vnstatd = { };
@@ -37,7 +38,7 @@ in 
        "man:vnstat.conf(5)"

      ];

      serviceConfig = {

        ExecStart = "${pkgs.vnstat}/bin/vnstatd -n";

        ExecStart = "${cfg.package}/bin/vnstatd -n";

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



        # Hardening (from upstream example service)

nixos/modules/services/networking/avahi-daemon.nix

+3 −1
Original line number Diff line number Diff line
@@ -276,6 +276,8 @@ in 
        Extra config to append to avahi-daemon.conf.

      '';

    };



    debug = lib.mkEnableOption "debug logging";

  };



  config = lib.mkIf cfg.enable {
@@ -356,7 +358,7 @@ in 
        NotifyAccess = "main";

        BusName = "org.freedesktop.Avahi";

        Type = "dbus";

        ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf}";

        ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf} ${lib.optionalString cfg.debug "--debug"}";

        ConfigurationDirectory = "avahi/services";



        # Hardening