diff options
author | Naïm Favier <n@monade.li> | 2022-12-21 12:49:37 +0100 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2022-12-21 13:23:28 +0100 |
commit | fc346c5e6282c8e5a4115da7420505a2fbdd3d12 (patch) | |
tree | 137f654d113d3c17245110572e636bcf3246ee7f /pkgs/os-specific/linux/kernel/generic.nix | |
parent | 03554797153aa90263161784c296ef6518af3358 (diff) |
linux: use `lib.versions.pad` for `modDirVersion`
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5a4c2858f95f7..dce2ed074a05a 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -29,7 +29,8 @@ structuredExtraConfig ? {} , # The version number used for the module directory - modDirVersion ? version + # If unspecified, this is determined automatically from the version. + modDirVersion ? null , # An attribute set whose attributes express the availability of # certain features in this kernel. E.g. `{iwlwifi = true;}' @@ -195,15 +196,15 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix { inherit buildPackages; }) (basicArgs // { - inherit modDirVersion kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; + inherit kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; pos = builtins.unsafeGetAttrPos "version" args; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; - }); + } // lib.optionalAttrs (modDirVersion != null) { inherit modDirVersion; }); passthru = basicArgs // { features = kernelFeatures; - inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; + inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); tests = let |