aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

helios4: remove need for overlay

Browse source 
Note that the linux kernel can and should be accessed through
config.kernelPackages.kernel.
This commit is contained in:
Jörg Thalheim 2024-05-06 08:41:04 +02:00 committed by mergify[bot]
parent 6cb18a6649
commit a4e2b7909f
2 changed files with 35 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
kobol/helios4/default.nix
View file

@ -1,17 +1,44 @@
{ pkgs, ... }: { pkgs, ... }:
let
linux_5_15_helios4 = pkgs.linux_5_15.override {
kernelPatches = [
# A patch to get both PWM fans working
# the patch has been successfully applied to 5.15 and 5.19
{
patch = pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch";
sha256 = "sha256-eQqMp0+MZd30zkl8DE89oB7czvyqCkfwF2k0EZ69jr0=";
};
}
# support for Wake-On-Lan
{
patch = pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/92-mvebu-gpio-add_wake_on_gpio_support.patch";
sha256 = "sha256-OrvnVCU55P0U78jdoxGRJvl29i+Rvq8AdEGSCCpxa2I=";
};
}
{
patch = pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/94-helios4-dts-add-wake-on-lan-support.patch";
sha256 = "sha256-ai4161bTC22023eaVVWsvbk6fQKjkv0P4DQ4DA1Zgow=";
};
}
];
defconfig = "mvebu_v7_defconfig";
# Make the kernel build a bit faster by disabling GPU modules, which we don't need anyways
structuredExtraConfig = with pkgs.lib.kernel; {
DRM = no;
};
};
in
{ {
imports = [ imports = [ ./modules/fancontrol.nix ];
./modules/fancontrol.nix
];
nixpkgs.overlays = [ nixpkgs.overlays = [ (import ./overlay.nix) ];
(import ./overlay.nix)
];
nixpkgs.hostPlatform = "armv7l-linux"; nixpkgs.hostPlatform = "armv7l-linux";
boot.initrd.availableKernelModules = [ "ahci_mvebu" ]; boot.initrd.availableKernelModules = [ "ahci_mvebu" ];
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_5_15_helios4; boot.kernelPackages = pkgs.linuxPackagesFor linux_5_15_helios4;
} }

32
kobol/helios4/overlay.nix
View file

@ -1,36 +1,4 @@
final: _prev: { final: _prev: {
linux_5_15_helios4 = final.linux_5_15.override {
kernelPatches = [
# A patch to get both PWM fans working
# the patch has been successfully applied to 5.15 and 5.19
{
patch = final.fetchpatch {
url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch";
sha256 = "sha256-eQqMp0+MZd30zkl8DE89oB7czvyqCkfwF2k0EZ69jr0=";
};
}
# support for Wake-On-Lan
{
patch = final.fetchpatch {
url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/92-mvebu-gpio-add_wake_on_gpio_support.patch";
sha256 = "sha256-OrvnVCU55P0U78jdoxGRJvl29i+Rvq8AdEGSCCpxa2I=";
};
}
{
patch = final.fetchpatch {
url = "https://raw.githubusercontent.com/armbian/build/bd3466eef2106ea13e85e821f5d852ff97465e6c/patch/kernel/archive/mvebu-5.15/94-helios4-dts-add-wake-on-lan-support.patch";
sha256 = "sha256-ai4161bTC22023eaVVWsvbk6fQKjkv0P4DQ4DA1Zgow=";
};
}
];
defconfig = "mvebu_v7_defconfig";
# Make the kernel build a bit faster by disabling GPU modules, which we don't need anyways
structuredExtraConfig = with final.lib.kernel; {
DRM = no;
};
};
ubootHelios4 = final.buildUBoot rec { ubootHelios4 = final.buildUBoot rec {
defconfig = "helios4_defconfig"; defconfig = "helios4_defconfig";
filesToInstall = [ "u-boot-spl.kwb" ]; filesToInstall = [ "u-boot-spl.kwb" ];