b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #172131 from euank/ena-2.7.1

Browse source 
ena: 2.5.0 -> 2.7.1 & nixos/amazon-image: default to 5.15 kernel
This commit is contained in:
Artturi 2022-05-12 01:38:24 +03:00 committed by GitHub
parent f324030ab6 35cfe2c29c
commit c7b10b6df9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/virtualisation/amazon-image.nix
View file

@ -37,13 +37,11 @@ in
{ assertion = cfg.efi -> cfg.hvm; { assertion = cfg.efi -> cfg.hvm;
message = "EC2 instances using EFI must be HVM instances."; message = "EC2 instances using EFI must be HVM instances.";
} }
{ assertion = versionOlder config.boot.kernelPackages.kernel.version "5.15"; { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17";
message = "ENA driver fails to build with kernel >= 5.15"; message = "ENA driver fails to build with kernel >= 5.17";
} }
]; ];
boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_10;
boot.growPartition = cfg.hvm; boot.growPartition = cfg.hvm;
fileSystems."/" = mkIf (!cfg.zfs.enable) { fileSystems."/" = mkIf (!cfg.zfs.enable) {

6
pkgs/os-specific/linux/ena/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, kernel }: { lib, stdenv, fetchFromGitHub, kernel }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.5.0"; version = "2.7.1";
name = "ena-${version}-${kernel.version}"; name = "ena-${version}-${kernel.version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "amzn"; owner = "amzn";
repo = "amzn-drivers"; repo = "amzn-drivers";
rev = "ena_linux_${version}"; rev = "ena_linux_${version}";
sha256 = "sha256-uOf/1624UtjaZtrk7XyQpeUGdTNVDnzZJZMgU86i+SM="; sha256 = "sha256-JkGzmmsAmLvL9e+bg58H79GNHgsqydK/79VoWEq5/Mc=";
}; };
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only; license = licenses.gpl2Only;
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
platforms = platforms.linux; platforms = platforms.linux;
broken = kernel.kernelAtLeast "5.15"; broken = kernel.kernelAtLeast "5.17";
}; };
} }