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

Merge master into staging-next

parents f25ecc69 2ea12393

maintainers/maintainer-list.nix

+18 −0
Original line number Diff line number Diff line
@@ -7164,6 +7164,12 @@ 
    githubId = 15128988;

    name = "Maksim Dzabraev";

  };

  dzervas = {

    name = "Dimitris Zervas";

    email = "dzervas@dzervas.gr";

    github = "dzervas";

    githubId = 1029195;

  };

  dzmitry-lahoda = {

    email = "dzmitry@lahoda.pro";

    github = "dzmitry-lahoda";
@@ -19295,6 +19301,12 @@ 
    githubId = 1538622;

    name = "Michael Reilly";

  };

  onatustun = {

    email = "contact@onatustun.com";

    name = "Onat Ustun";

    github = "onatustun";

    githubId = 41642110;

  };

  ondt = {

    name = "Ondrej Telka";

    email = "nix@ondt.dev";
@@ -21460,6 +21472,12 @@ 
    github = "randomdude16671";

    githubId = 210965013;

  };

  randoneering = {

    name = "randoneering";

    email = "justin@randoneering.tech";

    github = "randoneering";

    githubId = 127273550;

  };

  rane = {

    name = "Rane";

    email = "rane+git@junkyard.systems";

nixos/modules/hardware/facter/default.nix

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

  lib,

  config,

  ...

}:

{

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



  options.hardware.facter = with lib; {

    report = mkOption {

      type = types.attrsOf types.anything;

      default =

        if config.hardware.facter.reportPath == null then

          { }

        else

          builtins.fromJSON (builtins.readFile config.hardware.facter.reportPath);

      defaultText = "A JSON import from config.hardware.facter.reportPath (if not null), {} otherwise.";

      description = ''

        Hardware report data generated by nixos-facter.



        See <https://nix-community.github.io/nixos-facter/> for more information.

      '';

    };



    reportPath = mkOption {

      type = types.nullOr types.path;

      default = null;

      description = ''

        Path to a hardware report generated by nixos-facter.



        To generate a report, run the following as root:

        ```

        nix-shell -p nixos-facter --run nixos-facter > facter.json

        ```



        See <https://nix-community.github.io/nixos-facter/> for more information.

      '';

    };

  };

}

nixos/modules/module-list.nix

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

  ./hardware/device-tree.nix

  ./hardware/digitalbitbox.nix

  ./hardware/facter

  ./hardware/flipperzero.nix

  ./hardware/flirc.nix

  ./hardware/fw-fanctrl.nix

nixos/modules/services/security/esdm.nix

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ in 
      {

        systemd.packages = [ cfg.package ];

        systemd.services."esdm-server".wantedBy = [ "basic.target" ];

        systemd.services."esdm-kernel-seeder".wantedBy = [ "basic.target" ];

      }

      # It is necessary to set those options for these services to be started by systemd in NixOS

      (lib.mkIf cfg.enableLinuxCompatServices {
@@ -64,7 +65,6 @@ in 
  );



  meta.maintainers = with lib.maintainers; [

    orichter

    thillux

  ];

}

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -520,6 +520,7 @@ in 
  etebase-server = runTest ./etebase-server.nix;

  etesync-dav = runTest ./etesync-dav.nix;

  evcc = runTest ./evcc.nix;

  facter = runTest ./facter;

  fail2ban = runTest ./fail2ban.nix;

  fakeroute = runTest ./fakeroute.nix;

  fancontrol = runTest ./fancontrol.nix;