This commit is contained in:
mjallen18
2026-01-14 10:37:22 -06:00
parent b1f2521260
commit b1215da790
3 changed files with 35 additions and 9 deletions

View File

@@ -14,9 +14,26 @@ let
tag = "stable_20250916"; tag = "stable_20250916";
hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0=="; hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
# modDirVersion = "6.18.1";
# tag = "unstable_20251226"; # all of these fail for various reasons
# hash = "sha256-VYrXqwK9P2nWkm3DhOU8qaXzWv5L0DUoJ2MBRF6PoEE=";
# tag = "unstable_20260116";
# modDirVersion = "6.15.11";
# hash = "sha256-25g+LkVJMixVwUf+MRoIvLkVj31sFGAK9+i3OEFkFc0=";
# rev = "b07d612aae961e99fdb0b828ce6d54c183d1833d";
# modDirVersion = "6.17.12";
# hash = "sha256-JcjRy1FbOPWqqxKe/BjzMJBStA7rjK4+pS8kqL9GZBg=";
# rev = "682dc10883eefbcbc4a5ec661b231a638192b98f";
# modDirVersion = "6.18.4";
# hash = "sha256-T3RJRroYtzLwx4JqcaX15Ka1uVf72jQOZMf7TJVZ6co=";
# rev = "bb594fb36f555f9b88b7b6fcf8b71c669c1d60c7";
# modDirVersion = "6.19.0-rc5";
# hash = "sha256-C81aKv+pQYNx6Bj3PL0vrxvBzrLB99+95YeIBm+4kt0=";
# rev = "12e23f26704f66c154de58f80222960f02885570";
in in
lib.overrideDerivation lib.overrideDerivation
(buildLinux ( (buildLinux (
@@ -29,7 +46,6 @@ lib.overrideDerivation
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "linux"; repo = "linux";
#rev = "0176325914cab516b73a5f1456fcd5f98c4764ab";
inherit tag hash; inherit tag hash;
}; };

View File

@@ -68,12 +68,14 @@ stdenvNoCC.mkDerivation rec {
runHook preInstall runHook preInstall
mkdir -p "$out" mkdir -p "$out"
cp ${src} . # cp ${src} .
dd if=${nvram} of=./RPI_EFI.fd \ # dd if=${nvram} of=./RPI_EFI.fd \
bs=1 seek=$((0x1d0060)) count=$((0x11c0)) conv=notrunc # bs=1 seek=$((0x1d0060)) count=$((0x11c0)) conv=notrunc
cp -v ./RPI_EFI.fd "$out/RPI_EFI.fd" # cp -v ./RPI_EFI.fd "$out/RPI_EFI.fd"
cp ${src} "$out/RPI_EFI.fd"
cat > "$out/config.txt" << ${defaultConfig} cat > "$out/config.txt" << ${defaultConfig}

View File

@@ -12,10 +12,18 @@
# }; # };
# kernelPackages = kernelBundle.linuxPackages_rpi4; # kernelPackages = kernelBundle.linuxPackages_rpi4;
# kernelPackages = pkgs.${namespace}.linuxPackages_cachyos-lto; # kernelPackages = pkgs.${namespace}.linuxPackages_cachyos-lto;
kernelPackages = pkgs.unstable.linuxPackages_latest; kernelPackages = pkgs.${namespace}.linuxPackages_rpi4;
supportedFilesystems = lib.mkForce [ ]; supportedFilesystems = lib.mkForce [ ];
}; };
specialisation = {
"linux-latest".configuration = {
boot = {
kernelPackages = lib.mkOverride 90 pkgs.unstable.linuxPackages_latest;
};
};
};
${namespace}.hardware.raspberry-pi.config = { ${namespace}.hardware.raspberry-pi.config = {
all = { all = {
# [all] conditional filter, https://www.raspberrypi.com/documentation/computers/config_txt.html#conditional-filters # [all] conditional filter, https://www.raspberrypi.com/documentation/computers/config_txt.html#conditional-filters