mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 17:27:14 +08:00 
			
		
		
		
	surface: linux 6.4.14 -> 6.4.16
This commit is contained in:
		
				
					committed by
					
						
						mergify[bot]
					
				
			
			
				
	
			
			
			
						parent
						
							77d8ac78a6
						
					
				
				
					commit
					55fc5e69cb
				
			@@ -10,7 +10,7 @@ in {
 | 
			
		||||
    ./surface-control
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  microsoft-surface.kernelVersion = mkDefault "6.4.14";
 | 
			
		||||
  microsoft-surface.kernelVersion = mkDefault "6.4.16";
 | 
			
		||||
 | 
			
		||||
  # Seems to be required to properly enable S0ix "Modern Standby":
 | 
			
		||||
  boot.kernelParams = mkDefault [ "mem_sleep_default=deep" ];
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@ in {
 | 
			
		||||
    ./linux-5.19.17
 | 
			
		||||
    ./linux-6.0.17
 | 
			
		||||
    ./linux-6.1.18
 | 
			
		||||
    ./linux-6.4.14
 | 
			
		||||
    ./linux-6.4.16
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  options.microsoft-surface.kernelVersion = mkOption {
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@ let
 | 
			
		||||
 | 
			
		||||
  cfg = config.microsoft-surface;
 | 
			
		||||
 | 
			
		||||
  version = "6.4.14";
 | 
			
		||||
  version = "6.4.16";
 | 
			
		||||
  extraMeta.branch = "6.4";
 | 
			
		||||
  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 = "1rjh0jrn5qvxwzmyg478n08vckkld8r52nkc102ppqvsfhiy7skm";
 | 
			
		||||
      sha256 = "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
in {
 | 
			
		||||
  options.microsoft-surface.kernelVersion = mkOption {
 | 
			
		||||
    type = types.enum [ "6.4.14" ];
 | 
			
		||||
    type = types.enum [ "6.4.16" ];
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  config = mkIf (cfg.kernelVersion == "6.4.14") {
 | 
			
		||||
  config = mkIf (cfg.kernelVersion == "6.4.16") {
 | 
			
		||||
    boot = {
 | 
			
		||||
      inherit kernelPackages;
 | 
			
		||||
    };
 | 
			
		||||
		Reference in New Issue
	
	Block a user