diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2023-05-27 10:58:46 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2023-05-27 18:46:12 +0200 |
| commit | d915eb8adfee81f3d68ec22e2e5b8572cbbed844 (patch) | |
| tree | cdace761735beb4ddde4c78228864bd6df15fdb1 | |
| parent | Merge pull request #234246 from fabaff/adafruit-pureio-bump (diff) | |
| download | nixpkgs-d915eb8adfee81f3d68ec22e2e5b8572cbbed844.tar.gz | |
linuxPackages.ena: 2.8.3 -> 2.8.6 and fix build against Linux 6.3
This applies some patches that will be in the next version of ena, one
fixing the removal of the adjfreq field in ptp_clock_info, and the
others dealing with devlink changes.
https://hydra.nixos.org/build/221431596
| -rw-r--r-- | pkgs/os-specific/linux/ena/default.nix | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index a7843ee3894c..abc116efdcb2 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,16 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel }: stdenv.mkDerivation rec { - version = "2.8.3"; + version = "2.8.6"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-Z5BCqqC4FNKHqpocJ6CsHwhh5sszj5QfxiN6+Dkaqek="; + hash = "sha256-clRu+ecK/Je0kvlAAm6qCJqMyvZv0C88YIGDImhRhKA="; }; + patches = + [ # https://github.com/amzn/amzn-drivers/issues/269#issuecomment-1552483792 + (fetchpatch { + url = "https://github.com/amzn/amzn-drivers/files/11504862/phc_kernel_6_2_fix.patch"; + hash = "sha256-/EBkISwXMd7t4WZjsG9KVP6vncFwcZq1QBsxQLXyWsY="; + }) + # https://github.com/amzn/amzn-drivers/issues/270#issuecomment-1561924754 + (fetchpatch { + url = "https://github.com/amzn/amzn-drivers/files/11559312/devlink_6_2_fix.patch"; + hash = "sha256-Nc71u91G0dL+ld6ovqjHaE6X2TxduWeQYr5K0KdoA3Q="; + }) + (fetchpatch { + url = "https://github.com/amzn/amzn-drivers/files/11559314/devlink_6_3_fix.patch"; + hash = "sha256-aEQTbwHC1DcDrtj188eoGzi3GU9MXnwIxuJW4L7qb/I="; + }) + ]; + hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; |