public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87856 from eadwu/kernel/same-kernel

Browse Source 
nixos/kernel.nix: ensure same kernel is used
This commit is contained in:
Dmitry Kalinkin
2021-01-30 22:13:02 -05:00
committed by GitHub
parent b81d40351b 78f915a002
commit 8468a9878c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/kernel.nix
+4 -6
View File
@@ -37,12 +37,10 @@ in
boot.kernelPackages = mkOption { boot.kernelPackages = mkOption {
default = pkgs.linuxPackages; default = pkgs.linuxPackages;
type = types.unspecified // { merge = mergeEqualOption; }; type = types.unspecified // { merge = mergeEqualOption; };
apply = kernelPackages: kernelPackages.extend (self: super: { apply = kernelPackages: pkgs.linuxPackagesFor (kernelPackages.kernel.override {
kernel = super.kernel.override { inherit randstructSeed;
inherit randstructSeed; kernelPatches = kernelPackages.kernel.kernelPatches ++ kernelPatches;
kernelPatches = super.kernel.kernelPatches ++ kernelPatches; features = lib.recursiveUpdate kernelPackages.kernel.features features;
features = lib.recursiveUpdate super.kernel.features features;
};
}); });
# We don't want to evaluate all of linuxPackages for the manual # We don't want to evaluate all of linuxPackages for the manual
# - some of it might not even evaluate correctly. # - some of it might not even evaluate correctly.