Merge branch 'master' into system76/gaze18

matteobongio · web-flow · commit fc87e6dccefa · 2025-08-06T17:58:23.000+02:00
diff --git a/framework/13-inch/amd-ai-300-series/default.nix b/framework/13-inch/amd-ai-300-series/default.nix
@@ -15,6 +15,8 @@
       lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo";
 
     # suspend works with 6.15
-    boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.15") pkgs.linuxPackages_latest;
+    boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.15") (
+      lib.mkDefault pkgs.linuxPackages_latest
+    );
   };
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo";`
`16`	`16`
`17`	`17`	`# suspend works with 6.15`
`18`		`- boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.15") pkgs.linuxPackages_latest;`
	`18`	`+ boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.15") (`
	`19`	`+ lib.mkDefault pkgs.linuxPackages_latest`
	`20`	`+ );`
`19`	`21`	`};`
`20`	`22`	`}`