pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #298049 from wfdewith/fix-kernels

kernel: fix builds for linux_lqx and linux_{4_19,5_4}_hardened

authored by

Thiago Kenji Okada and committed by
GitHub d61b866e ad9440ea

+7 -2
-1
pkgs/os-specific/linux/dpdk-kmods/default.nix
··· 32 32 license = licenses.gpl2Only; 33 33 maintainers = [ maintainers.mic92 ]; 34 34 platforms = platforms.linux; 35 - broken = kernel.isHardened; 36 35 }; 37 36 }
+5 -1
pkgs/os-specific/linux/kernel/generic.nix
··· 13 13 , rustPlatform 14 14 , rust-bindgen 15 15 , nixosTests 16 - }: 16 + }@args': 17 17 18 18 lib.makeOverridable ({ # The kernel source tarball. 19 19 src ··· 68 68 , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false 69 69 , kernelArch ? stdenv.hostPlatform.linuxArch 70 70 , kernelTests ? [] 71 + 72 + , stdenv ? args'.stdenv 73 + , buildPackages ? args'.buildPackages 74 + 71 75 , ... 72 76 }@args: 73 77
+2
pkgs/os-specific/linux/kernel/zen-kernels.nix
··· 93 93 RT_GROUP_SCHED = lib.mkForce (option no); 94 94 SCHED_AUTOGROUP = lib.mkForce (option no); 95 95 SCHED_CORE = lib.mkForce (option no); 96 + UCLAMP_TASK = lib.mkForce (option no); 97 + UCLAMP_TASK_GROUP = lib.mkForce (option no); 96 98 97 99 # ERROR: modpost: "sched_numa_hop_mask" [drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko] undefined! 98 100 MLX5_CORE = no;