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

Merge master into staging-next

parents 01f6e666 4d008925

maintainers/github-teams.json

+0 −1
Original line number Diff line number Diff line
@@ -552,7 +552,6 @@ 
      "lf-": 6652840

    },

    "members": {

      "9999years": 15312184,

      "Qyriad": 1542224,

      "RaitoBezarius": 314564

    },

nixos/modules/hardware/facter/default.nix

+13 −0
Original line number Diff line number Diff line
@@ -23,6 +23,19 @@ 
  meta.maintainers = with lib.maintainers; [ mic92 ];



  options.hardware.facter = with lib; {

    enable = mkOption {

      type = types.bool;

      default = config.hardware.facter.report != { };

      defaultText = literalExpression ''

        config.hardware.facter.report != { }

      '';

      description = ''

        Whether to enable automatic hardware configuration using a report generated by nixos-facter.



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

      '';

    };



    report = mkOption {

      type = types.attrsOf types.anything;

      default =

nixos/modules/hardware/facter/disk.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ in 
    '';

  };



  config = lib.mkIf (config.hardware.facter.reportPath != null) {

  config = lib.mkIf config.hardware.facter.enable {

    boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.disk.kernelModules;

  };

}

nixos/modules/hardware/facter/firmware.nix

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ let 
  hasIntelCpu = facterLib.hasIntelCpu report;

in

{

  config = lib.mkIf (config.hardware.facter.reportPath != null && isBaremetal) {

  config = lib.mkIf (config.hardware.facter.enable && isBaremetal) {

    # none (e.g. bare-metal)

    # provide firmware for devices that might not have been detected by nixos-facter

    hardware.enableRedistributableFirmware = lib.mkDefault true;

nixos/modules/hardware/facter/graphics/amd.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ in 
      defaultText = "hardware dependent";

    };

  };

  config = lib.mkIf (config.hardware.facter.reportPath != null && cfg.enable) {

  config = lib.mkIf (config.hardware.facter.enable && cfg.enable) {

    services.xserver.videoDrivers = [ "modesetting" ];

  };

}