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

Revert "nixos/kernel.nix: ensure same kernel is used"

Browse Source 
This reverts commit 78f915a002.
This commit is contained in:
Ben Wolsieffer
2021-02-03 20:31:22 -05:00
committed by Dmitry Kalinkin
parent fc9d4763b9
commit f413b2bc51
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/kernel.nix
+6 -4
View File
@@ -37,10 +37,12 @@ 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: pkgs.linuxPackagesFor (kernelPackages.kernel.override { apply = kernelPackages: kernelPackages.extend (self: super: {
inherit randstructSeed; kernel = super.kernel.override {
kernelPatches = kernelPackages.kernel.kernelPatches ++ kernelPatches; inherit randstructSeed;
features = lib.recursiveUpdate kernelPackages.kernel.features features; kernelPatches = super.kernel.kernelPatches ++ kernelPatches;
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.