From 33397faec9d1e7672605afdff749b6a9d6378d02 Mon Sep 17 00:00:00 2001 From: Nicholas Sielicki Date: Tue, 31 Jan 2023 03:31:00 +0000 Subject: [PATCH] ena: 2.8.0 -> 2.8.2 * Notably, fixes build on kernel >= 5.17 Signed-off-by: Nicholas Sielicki --- nixos/modules/virtualisation/amazon-image.nix | 6 +----- pkgs/os-specific/linux/ena/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index e6c2c72339fd..aa44f2642697 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -25,11 +25,7 @@ in config = { - assertions = [ - { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17"; - message = "ENA driver fails to build with kernel >= 5.17"; - } - ]; + assertions = [ ]; boot.growPartition = true; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index f0a05437b682..fe056be74a7e 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.8.0"; + version = "2.8.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-Nw86s93v8ahc/yt5sNsGz4LRwzDPtBnIZNno8vpFdsY="; + sha256 = "sha256-KlRNI2lnUbNeQGY1G+Qm683yXRTNCJwWIri51+PAi9o="; }; hardeningDisable = [ "pic" ];