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

Merge master into staging-next

parents b5f6f1f8 312f2bea

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -5471,12 +5471,6 @@ 
    name = "Dima";

    keys = [ { fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; } ];

  };

  d-xo = {

    email = "hi@d-xo.org";

    github = "d-xo";

    githubId = 6689924;

    name = "David Terry";

  };

  d3vil0p3r = {

    name = "Antonio Voza";

    email = "vozaanthony@gmail.com";

nixos/modules/hardware/sheep-net.nix

0 → 100644
+34 −0
Original line number Diff line number Diff line 
{

  config,

  lib,

  ...

}:



let

  cfg = config.hardware.sheep_net;

in

{

  options.hardware.sheep_net = {

    enable = lib.mkOption {

      type = lib.types.bool;

      default = false;

      description = ''

        Enables sheep_net udev rules, ensures 'sheep_net' group exists, and adds

        sheep-net to boot.kernelModules and boot.extraModulePackages

      '';

    };

  };

  config = lib.mkIf cfg.enable {

    services.udev.extraRules = ''

      KERNEL=="sheep_net", GROUP="sheep_net"

    '';

    boot.kernelModules = [

      "sheep_net"

    ];

    boot.extraModulePackages = [

      config.boot.kernelPackages.sheep-net

    ];

    users.groups.sheep_net = { };

  };

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

}

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
  ./hardware/sata.nix

  ./hardware/sensor/hddtemp.nix

  ./hardware/sensor/iio.nix

  ./hardware/sheep-net.nix

  ./hardware/steam-hardware.nix

  ./hardware/system-76.nix

  ./hardware/tuxedo-drivers.nix

nixos/tests/bazarr.nix

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ let 
in

{

  name = "bazarr";

  meta.maintainers = with lib.maintainers; [ d-xo ];



  nodes.machine =

    { pkgs, ... }:

nixos/tests/wireguard/wg-quick.nix

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ import ../make-test-python.nix ( 
  in

  {

    name = "wg-quick";

    meta = with pkgs.lib.maintainers; {

      maintainers = [ d-xo ];

    };



    nodes = {

      peer0 = peer {