mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 17:27:14 +08:00 
			
		
		
		
	surface: linux 6.5.5 -> 6.5.7
This commit is contained in:
		
				
					committed by
					
						
						mergify[bot]
					
				
			
			
				
	
			
			
			
						parent
						
							9f8e88ff95
						
					
				
				
					commit
					9eb41407ab
				
			@@ -10,7 +10,7 @@ in {
 | 
			
		||||
    ./surface-control
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  microsoft-surface.kernelVersion = mkDefault "6.5.5";
 | 
			
		||||
  microsoft-surface.kernelVersion = mkDefault "6.5.7";
 | 
			
		||||
 | 
			
		||||
  # Seems to be required to properly enable S0ix "Modern Standby":
 | 
			
		||||
  boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ let
 | 
			
		||||
in {
 | 
			
		||||
  imports = [
 | 
			
		||||
    ./linux-6.1.55
 | 
			
		||||
    ./linux-6.5.5
 | 
			
		||||
    ./linux-6.5.7
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  options.microsoft-surface.kernelVersion = mkOption {
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@ let
 | 
			
		||||
 | 
			
		||||
  cfg = config.microsoft-surface;
 | 
			
		||||
 | 
			
		||||
  version = "6.5.5";
 | 
			
		||||
  version = "6.5.7";
 | 
			
		||||
  extraMeta.branch = "6.5";
 | 
			
		||||
  patchDir = repos.linux-surface + "/patches/${extraMeta.branch}";
 | 
			
		||||
  kernelPatches = pkgs.callPackage ./patches.nix {
 | 
			
		||||
@@ -20,17 +20,17 @@ let
 | 
			
		||||
    inherit version extraMeta kernelPatches;
 | 
			
		||||
    src = fetchurl {
 | 
			
		||||
      url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
 | 
			
		||||
      sha256 = "15gg8sb6cfgk1afwj7fl7mj4nkj14w43vzwvw0qsg3nzyxwh7wcc";
 | 
			
		||||
      sha256 = "135v3y2vgc83dca4xi7q52wqi4dkfal74k1y73jwzj85h12fl28d";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
in {
 | 
			
		||||
  options.microsoft-surface.kernelVersion = mkOption {
 | 
			
		||||
    type = types.enum [ "6.5.5" ];
 | 
			
		||||
    type = types.enum [ "6.5.7" ];
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  config = mkIf (cfg.kernelVersion == "6.5.5") {
 | 
			
		||||
  config = mkIf (cfg.kernelVersion == "6.5.7") {
 | 
			
		||||
    boot = {
 | 
			
		||||
      inherit kernelPackages;
 | 
			
		||||
    };
 | 
			
		||||
		Reference in New Issue
	
	Block a user