summary refs log tree commit diff
diff options
context:
space:
mode:
authorEuan Kemp <euank@euank.com>2022-05-08 16:48:49 -0700
committerEuan Kemp <euank@euank.com>2022-05-08 21:13:50 -0700
commit35cfe2c29c96d93b4430c59983361c61aaf002ae (patch)
treec8fccca3a26ff859b9e2fd7cf22508ea566f23c9
parentbb0210e327fb5e7023aefb886f8eb7aa153078fb (diff)
downloadnixpkgs-35cfe2c29c96d93b4430c59983361c61aaf002ae.tar
nixpkgs-35cfe2c29c96d93b4430c59983361c61aaf002ae.tar.gz
nixpkgs-35cfe2c29c96d93b4430c59983361c61aaf002ae.tar.bz2
nixpkgs-35cfe2c29c96d93b4430c59983361c61aaf002ae.tar.lz
nixpkgs-35cfe2c29c96d93b4430c59983361c61aaf002ae.tar.xz
nixpkgs-35cfe2c29c96d93b4430c59983361c61aaf002ae.tar.zst
nixpkgs-35cfe2c29c96d93b4430c59983361c61aaf002ae.zip
nixos/amazon-image: default to 5.15 kernel
Previously, it was held back due to the ENA driver not building on the
current default (5.15). The previous commit bumps the ENA driver, which
allows 5.15 to work.
-rw-r--r--nixos/modules/virtualisation/amazon-image.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 9a56b695015..12fe6fa4447 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -37,13 +37,11 @@ in
       { assertion = cfg.efi -> cfg.hvm;
         message = "EC2 instances using EFI must be HVM instances.";
       }
-      { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.15";
-        message = "ENA driver fails to build with kernel >= 5.15";
+      { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17";
+        message = "ENA driver fails to build with kernel >= 5.17";
       }
     ];
 
-    boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_10;
-
     boot.growPartition = cfg.hvm;
 
     fileSystems."/" = mkIf (!cfg.zfs.enable) {