diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-12 12:01:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-12 12:01:01 +0000 |
| commit | 9f3079a7c3de354fb485c3edbc23a51548da1edd (patch) | |
| tree | 8da7580098173d1e43a86007cd7e43488f867a65 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | 34f1f577054ad2f15d19c31016e90a654809bc7b (diff) | |
| parent | 9f039b93af2d6865640c173aed9aaeb763dc5a47 (diff) | |
| download | nixpkgs-9f3079a7c3de354fb485c3edbc23a51548da1edd.tar nixpkgs-9f3079a7c3de354fb485c3edbc23a51548da1edd.tar.gz nixpkgs-9f3079a7c3de354fb485c3edbc23a51548da1edd.tar.bz2 nixpkgs-9f3079a7c3de354fb485c3edbc23a51548da1edd.tar.lz nixpkgs-9f3079a7c3de354fb485c3edbc23a51548da1edd.tar.xz nixpkgs-9f3079a7c3de354fb485c3edbc23a51548da1edd.tar.zst nixpkgs-9f3079a7c3de354fb485c3edbc23a51548da1edd.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2b27d621821..c8ae911c128 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1038,7 +1038,7 @@ let # > CONFIG_KUNIT should not be enabled in a production environment. Enabling KUnit disables Kernel Address-Space Layout Randomization (KASLR), and tests may affect the state of the kernel in ways not suitable for production. # https://www.kernel.org/doc/html/latest/dev-tools/kunit/start.html - KUNIT = no; + KUNIT = whenAtLeast "5.5" no; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot |