diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-04 14:55:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-05 09:25:39 +0000 |
commit | 25208eeaba9e009a8248d1f720d1d5cc130dd05a (patch) | |
tree | 889fa0fa865306e8366bfbd7e1e808a758718ebe /pkgs/os-specific/linux/kernel/generic.nix | |
parent | f310134deca455fe21d96e85993f1e6c86a0304e (diff) |
linux: remove xen_dom0 feature entirely
Xen is now enabled unconditionally on kernels that support it, so the xen_dom0 feature doesn't do anything. The isXen attribute will now produce a deprecation warning and unconditionally return true. Passing in a custom value for isXen is no longer supported.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index ac9d6fbb2b594..4518b5a336bba 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -46,7 +46,6 @@ stdenv.hostPlatform != stdenv.buildPlatform , extraMeta ? {} -, isXen ? features.xen_dom0 or false , isZen ? false , isLibre ? false , isHardened ? false @@ -74,7 +73,6 @@ let needsCifsUtils = true; netfilterRPFilter = true; grsecurity = false; - xen_dom0 = false; ia32Emulation = true; } // features) kernelPatches; @@ -178,7 +176,8 @@ let passthru = { features = kernelFeatures; - inherit commonStructuredConfig isXen isZen isHardened isLibre; + inherit commonStructuredConfig isZen isHardened isLibre; + isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); |