nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-05 11:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/boot: move name overwrite to pkgs.aggregateModules to option

Browse Source 
Before there was a kernel modules path named kernel-modules which then got turned
into linux-X.X.XX-modules-shrunk. Now the unshrunk package is called linux-X.X.XX-modules
and gets turned into X.X.XX-modules-shrunk.
This commit is contained in:
Sandro Jäckel 2024-02-20 00:05:03 +01:00
parent 6476f360a4
commit 191e258e6c
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/kernel.nix
View File

@ -233,7 +233,9 @@ in
symlinks because modprobe only supports one directory.
'';
# Convert the list of path to only one path.
apply = pkgs.aggregateModules;
apply = let
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
in modules: (pkgs.aggregateModules modules).override { name = kernel-name + "-modules"; };
};
system.requiredKernelConfig = mkOption {

8
nixos/modules/system/boot/stage-1.nix
View File

@ -13,15 +13,11 @@ let
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
firmware = config.hardware.firmware;
# Determine the set of modules that we need to mount the root FS.
modulesClosure = pkgs.makeModulesClosure {
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
kernel = modulesTree;
firmware = firmware;
kernel = config.system.modulesTree;
firmware = config.hardware.firmware;
allowMissing = false;
};

6
nixos/modules/system/boot/systemd/initrd.nix
View File

@ -93,13 +93,11 @@ let
fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
firmware = config.hardware.firmware;
# Determine the set of modules that we need to mount the root FS.
modulesClosure = pkgs.makeModulesClosure {
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
kernel = modulesTree;
firmware = firmware;
kernel = config.system.modulesTree;
firmware = config.hardware.firmware;
allowMissing = false;
};