From fcee9937e729d8653fb7fdba421e997597342ff1 Mon Sep 17 00:00:00 2001 From: Nicholas Sielicki Date: Fri, 3 Feb 2023 01:50:28 +0000 Subject: [PATCH] ena: 2.8.0 -> 2.8.2 * ena: 2.8.0 -> 2.8.2 * fixes build on kernel >= 5.17 Signed-off-by: Nicholas Sielicki (cherry picked from commit 33397faec9d1e7672605afdff749b6a9d6378d02) * ena: remove broken --------- Co-authored-by: Nicholas Sielicki Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com> --- nixos/modules/virtualisation/amazon-image.nix | 3 --- pkgs/os-specific/linux/ena/default.nix | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 12fe6fa44479..bd7077ff7ea1 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -37,9 +37,6 @@ in { assertion = cfg.efi -> cfg.hvm; message = "EC2 instances using EFI must be HVM instances."; } - { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17"; - message = "ENA driver fails to build with kernel >= 5.17"; - } ]; boot.growPartition = cfg.hvm; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index b8128c83c0c6..72cd824ff989 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.7.1"; + version = "2.8.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-JkGzmmsAmLvL9e+bg58H79GNHgsqydK/79VoWEq5/Mc="; + sha256 = "sha256-KlRNI2lnUbNeQGY1G+Qm683yXRTNCJwWIri51+PAi9o="; }; hardeningDisable = [ "pic" ]; @@ -42,6 +42,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.17"; }; }