Merge pull request #1580 from NixOS/private-flake

Refactor tests to load flake inputs with flake-compat

Author: Mic92

.github/workflows/test.yml

@@ -11,11 +11,11 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - uses: cachix/install-nix-action@v31
-    - run: cd tests && nix fmt .. -- --fail-on-change
+    - run: nix build .#checks.x86_64-linux.formatting
   tests:
     needs: nixfmt
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
     - uses: cachix/install-nix-action@v31
-    - run: nix run ./tests#run .
+    - run: nix run .#run-tests

CONTRIBUTING.md

@@ -42,7 +42,7 @@ Link the profile in the table in README.md and in flake.nix.
 
 ## 3. Testing
 
-Run `nix run ./tests#run .` to evaluate all hardware profiles.
+Run `nix run .#run-tests` to evaluate all hardware profiles.
 Because profiles can only be tested with the appropriate hardware, quality
 assurance is up to *you*.
 

apple/imac/14-2/default.nix

@@ -29,7 +29,6 @@
       "bcma"
     ];
     kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.0") pkgs.linuxPackages_latest;
-    extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
   };
 
   hardware = {

apple/macbook-air/6/default.nix

@@ -3,8 +3,6 @@
 {
   imports = [ ../. ];
 
-  boot.kernelModules = [ "wl" ];
-  boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
   boot.blacklistedKernelModules = [ "bcma" ];
 
   boot = {

apple/macbook-pro/11-1/default.nix

@@ -6,9 +6,5 @@
     ../../../common/cpu/intel/haswell
   ];
 
-  # broadcom-wl
   hardware.enableRedistributableFirmware = lib.mkDefault true;
-  # nixos-generate-config doesn't detect this automatically.
-  boot.extraModulePackages = with config.boot.kernelPackages; [ broadcom_sta ];
-  boot.kernelModules = [ "wl" ];
 }

dell/inspiron/3442/default.nix

@@ -12,10 +12,4 @@
     fwupd.enable = lib.mkDefault true;
     thermald.enable = lib.mkDefault true;
   };
-
-  boot = {
-    # needs to be explicitly loaded or else bluetooth/wifi won't work.
-    kernelModules = [ "wl" ];
-    extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
-  };
 }

dell/xps/13-9343/default.nix

@@ -13,11 +13,8 @@
   };
 
   boot = {
-    # needs to be explicitly loaded or else bluetooth/wifi won't work
     kernelModules = [
       "kvm-intel"
-      "wl"
     ];
-    extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
   };
 }

flake.nix

@@ -2,7 +2,39 @@
   description = "nixos-hardware";
 
   outputs =
-    { ... }:
+    { self, ... }:
+    let
+      # Import private inputs (for development)
+      privateInputs =
+        (import ./tests/flake-compat.nix {
+          src = ./tests;
+        }).defaultNix;
+
+      systems = [
+        "aarch64-linux"
+        "riscv64-linux"
+        "x86_64-linux"
+      ];
+
+      formatSystems = [
+        "aarch64-linux"
+        "x86_64-linux"
+        "aarch64-darwin"
+      ];
+
+      # Helper to iterate over systems
+      eachSystem =
+        f:
+        privateInputs.nixos-unstable-small.lib.genAttrs systems (
+          system: f privateInputs.nixos-unstable-small.legacyPackages.${system} system
+        );
+
+      eachSystemFormat =
+        f:
+        privateInputs.nixos-unstable-small.lib.genAttrs formatSystems (
+          system: f privateInputs.nixos-unstable-small.legacyPackages.${system} system
+        );
+    in
     {
 
       nixosModules =
@@ -420,5 +452,40 @@
           common-pc-laptop-ssd = import ./common/pc/ssd;
           common-pc-ssd = import ./common/pc/ssd;
         };
+
+      # Add formatter for `nix fmt`
+      formatter = eachSystemFormat (
+        pkgs: _system:
+        (privateInputs.treefmt-nix.lib.evalModule pkgs ./tests/treefmt.nix).config.build.wrapper
+      );
+
+      # Add packages
+      packages = eachSystem (
+        pkgs: _system: {
+          run-tests = pkgs.callPackage ./tests/run-tests.nix {
+            inherit self;
+          };
+        }
+      );
+
+      # Add checks for `nix run .#run-tests`
+      checks = eachSystem (
+        pkgs: system:
+        let
+          treefmtEval = privateInputs.treefmt-nix.lib.evalModule pkgs ./tests/treefmt.nix;
+          nixosTests = import ./tests/nixos-tests.nix {
+            inherit
+              self
+              privateInputs
+              system
+              pkgs
+              ;
+          };
+        in
+        pkgs.lib.optionalAttrs (self.formatter ? ${system}) {
+          formatting = treefmtEval.config.build.check self;
+        }
+        // nixosTests
+      );
     };
 }

framework/13-inch/common/amd.nix

@@ -6,19 +6,18 @@
     ../../../common/gpu/amd
   ];
 
-  boot.kernelParams =
-    [
-      # There seems to be an issue with panel self-refresh (PSR) that
-      # causes hangs for users.
-      #
-      # https://community.frame.work/t/fedora-kde-becomes-suddenly-slow/58459
-      # https://gitlab.freedesktop.org/drm/amd/-/issues/3647
-      "amdgpu.dcdebugmask=0x10"
-    ]
-    # Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/
-    ++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") [
-      "rtc_cmos.use_acpi_alarm=1"
-    ];
+  boot.kernelParams = [
+    # There seems to be an issue with panel self-refresh (PSR) that
+    # causes hangs for users.
+    #
+    # https://community.frame.work/t/fedora-kde-becomes-suddenly-slow/58459
+    # https://gitlab.freedesktop.org/drm/amd/-/issues/3647
+    "amdgpu.dcdebugmask=0x10"
+  ]
+  # Workaround for SuspendThenHibernate: https://lore.kernel.org/linux-kernel/20231106162310.85711-1-mario.limonciello@amd.com/
+  ++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") [
+    "rtc_cmos.use_acpi_alarm=1"
+  ];
 
   # AMD has better battery life with PPD over TLP:
   # https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13

framework/13-inch/common/intel.nix

@@ -9,16 +9,15 @@
     ../../../common/cpu/intel
   ];
 
-  boot.kernelParams =
-    [
-      # For Power consumption
-      # https://community.frame.work/t/linux-battery-life-tuning/6665/156
-      "nvme.noacpi=1"
-    ]
-    # Fixes a regression in s2idle, making it more power efficient than deep sleep
-    # Update 04/2024: It appears that s2idle-regression got fixed in newer kernel-versions (SebTM)
-    # (see: https://github.com/NixOS/nixos-hardware/pull/903#discussion_r1556096657)
-    ++ lib.lists.optional (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") "acpi_osi=\"!Windows 2020\"";
+  boot.kernelParams = [
+    # For Power consumption
+    # https://community.frame.work/t/linux-battery-life-tuning/6665/156
+    "nvme.noacpi=1"
+  ]
+  # Fixes a regression in s2idle, making it more power efficient than deep sleep
+  # Update 04/2024: It appears that s2idle-regression got fixed in newer kernel-versions (SebTM)
+  # (see: https://github.com/NixOS/nixos-hardware/pull/903#discussion_r1556096657)
+  ++ lib.lists.optional (lib.versionOlder config.boot.kernelPackages.kernel.version "6.8") "acpi_osi=\"!Windows 2020\"";
 
   # Requires at least 5.16 for working wi-fi and bluetooth.
   # https://community.frame.work/t/using-the-ax210-with-linux-on-the-framework-laptop/1844/89