mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rpi

Browse Source
This commit is contained in:
Matt Jallen
2026-02-17 10:37:07 -06:00
parent ed19748358
commit a5162e9e76
6 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
overlays/linux-rpi/default.nix
View File

@@ -8,23 +8,28 @@ final: prev:
let let
ubootPackages = final.callPackage ../../packages/uboot { }; ubootPackages = final.callPackage ../../packages/uboot { };
fetchFromGitHub = inputs.nixpkgs.fetchFromGitHub; # fetchFromGitHub = inputs.nixpkgs.fetchFromGitHub;
linux618Src = fetchFromGitHub { # linux618Src = fetchFromGitHub {
owner = "raspberrypi"; # owner = "raspberrypi";
repo = "linux"; # repo = "linux";
rev = "bb594fb36f555f9b88b7b6fcf8b71c669c1d60c7"; # rev = "bb594fb36f555f9b88b7b6fcf8b71c669c1d60c7";
hash = "sha256-T3RJRroYtzLwx4JqcaX15Ka1uVf72jQOZMf7TJVZ6co="; # hash = "sha256-T3RJRroYtzLwx4JqcaX15Ka1uVf72jQOZMf7TJVZ6co=";
}; # };
linux619Src = fetchFromGitHub { # linux619Src = fetchFromGitHub {
owner = "raspberrypi"; # owner = "raspberrypi";
repo = "linux"; # repo = "linux";
rev = "12e23f26704f66c154de58f80222960f02885570"; # rev = "87e52a7868888c66b2782c949c8406c27f909c11";
hash = "sha256-C81aKv+pQYNx6Bj3PL0vrxvBzrLB99+95YeIBm+4kt0="; # hash = "sha256-C81aKv+pQYNx6Bj3PL0vrxvBzrLB99+95YeIBm+4kt0=";
}; # };
linux-rpi5 = final.linuxPackagesFor (final.${namespace}.linux-rpi); linux-rpi5 = final.linuxPackagesFor (final.${namespace}.linux-rpi);
linux-rpi5-latest = final.linuxPackagesFor (
final.${namespace}.linux-rpi.override {
kernelVersion = "unstable";
}
);
linux-rpi4 = final.linuxPackagesFor ( linux-rpi4 = final.linuxPackagesFor (
final.${namespace}.linux-rpi.override { final.${namespace}.linux-rpi.override {
@@ -39,21 +44,18 @@ in
linuxPackages_rpi5-lts = linux-rpi5; linuxPackages_rpi5-lts = linux-rpi5;
linuxPackages_rpi4-lts = linux-rpi4; linuxPackages_rpi4-lts = linux-rpi4;
linuxPackages_rpi5-latest = linux-rpi5.overrideAttrs (_old: { linuxPackages_rpi5-latest = linux-rpi5-latest;
modDirVersion = "6.18.4"; # linuxPackages_rpi5-rc = linux-rpi5.overrideAttrs (_old: {
src = linux618Src; # modDirVersion = "6.19.0-rc5";
}); # src = linux619Src;
linuxPackages_rpi5-rc = linux-rpi5.overrideAttrs (_old: { # });
modDirVersion = "6.19.0-rc5"; # linuxPackages_rpi4-latest = linux-rpi4.overrideAttrs (_old: {
src = linux619Src; # modDirVersion = "6.18.4";
}); # src = linux618Src;
linuxPackages_rpi4-latest = linux-rpi4.overrideAttrs (_old: { # });
modDirVersion = "6.18.4"; # linuxPackages_rpi4-rc = linux-rpi4.overrideAttrs (_old: {
src = linux618Src; # modDirVersion = "6.19.0-rc5";
}); # src = linux619Src;
linuxPackages_rpi4-rc = linux-rpi4.overrideAttrs (_old: { # });
modDirVersion = "6.19.0-rc5";
src = linux619Src;
});
}; };
} }

7
packages/raspberrypi/linux-rpi/default.nix
View File

@@ -5,6 +5,7 @@
buildLinux, buildLinux,
rpiVersion ? 5, rpiVersion ? 5,
namespace, namespace,
kernelVersion ? "stable",
... ...
}@args: }@args:
@@ -14,11 +15,11 @@ let
inherit (lib.${namespace}) selectVariant mkAllSources; inherit (lib.${namespace}) selectVariant mkAllSources;
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = selectVariant versionSpec "lts" null; selected = selectVariant versionSpec kernelVersion null;
sources = mkAllSources selected; sources = mkAllSources selected;
modDirVersion = selected.variables.modDirVersion; modDirVersion = selected.variables.modDirVersion;
tag = "stable"; # sources.tag; tag = kernelVersion; # sources.tag;
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
# all of these fail for various reasons # all of these fail for various reasons
@@ -49,7 +50,7 @@ lib.overrideDerivation
inherit modDirVersion; inherit modDirVersion;
pname = "linux-rpi${toString rpiVersion}"; pname = "linux-rpi${toString rpiVersion}";
src = sources.stable; src = sources.${kernelVersion};
defconfig = defconfig =
{ {

12
packages/raspberrypi/linux-rpi/version.json
View File

@@ -8,23 +8,23 @@
"tag": "stable_20250916", "tag": "stable_20250916",
"hash": "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==" "hash": "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0=="
}, },
"latest": { "unstable": {
"fetcher": "github", "fetcher": "github",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "0f10f52e19eb34d3aa9848fc262ffcd596c8337b", "rev": "87e52a7868888c66b2782c949c8406c27f909c11",
"hash": "sha256-HdMfQCoHL+BksDAZt8/jRtCh2I4dpaacr0yW+DF4DPo=" "hash": "sha256-1ob91gGajlTEZjn7GRls4bL5TP8Ulj74hoRUUlmeICA="
} }
}, },
"variants": { "variants": {
"lts": { "stable": {
"variables": { "variables": {
"modDirVersion": "6.12.47" "modDirVersion": "6.12.47"
} }
}, },
"latest": { "unstable": {
"variables": { "variables": {
"modDirVersion": "6.18.6" "modDirVersion": "6.18.10"
} }
} }
}, },

4
packages/raspberrypi/raspberryPiWirelessFirmware/version.json
View File

@@ -7,7 +7,7 @@
"owner": "RPi-Distro", "owner": "RPi-Distro",
"repo": "bluez-firmware", "repo": "bluez-firmware",
"rev": "cdf61dc691a49ff01a124752bd04194907f0f9cd", "rev": "cdf61dc691a49ff01a124752bd04194907f0f9cd",
"hash": "sha256-XgJwA2caixKdPkS28ThF8KUVlgR9IxDLaeBKIuoW5w8=" "hash": "sha256-35pnbQV/zcikz9Vic+2a1QAS72riruKklV8JHboL9NY="
}, },
"firmware-nonfree": { "firmware-nonfree": {
"fetcher": "github", "fetcher": "github",
@@ -15,7 +15,7 @@
"owner": "RPi-Distro", "owner": "RPi-Distro",
"repo": "firmware-nonfree", "repo": "firmware-nonfree",
"rev": "40dea60e27078fac57a3fed51010e2c26865d49b", "rev": "40dea60e27078fac57a3fed51010e2c26865d49b",
"hash": "sha256-hGNpr67WInWJDZ8o9eI+n08HcOZWL5BPy4Dmg2CDTUk=" "hash": "sha256-yXKzrkr7zdw/ba8GEi0r+XjnZEsQ59LPEuXj0HaKwxU="
} }
} }
} }

2
packages/raspberrypi/raspberrypi-utils/version.json
View File

@@ -6,7 +6,7 @@
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "utils", "repo": "utils",
"rev": "58d5da926965ad78fb863abacdd73a00dea022a1", "rev": "58d5da926965ad78fb863abacdd73a00dea022a1",
"hash": "sha256-4/1fFF7v7XhM0W31dFpPhtgCl/IkTsN6kU716gNDAdg=" "hash": "sha256-EjJMuqyJopZ+CsGrFwyjpOGx/p5+gww7IaIX0ZqlczU="
} }
} }
} }

36
systems/aarch64-linux/pi5/boot.nix
View File

@@ -41,24 +41,24 @@
]; ];
}; };
# specialisation = { specialisation = {
# "linux-latest".configuration = { "linux-latest".configuration = {
# boot = { boot = {
# kernelPackages = lib.mkOverride 90 pkgs.linuxPackages_pi5-16k; kernelPackages = lib.mkOverride 90 pkgs.${namespace}.linuxPackages_rpi5-latest;
# loader.systemd-boot.installDeviceTree = true; # loader.systemd-boot.installDeviceTree = true;
# }; };
# hardware.deviceTree = { # hardware.deviceTree = {
# enable = true; # enable = true;
# package = lib.mkForce pkgs.${namespace}.linuxPackages_rpi5-lts.kernel; # package = lib.mkForce pkgs.${namespace}.linuxPackages_rpi5-lts.kernel;
# name = "bcm2712-rpi-5-b.dtb"; # name = "bcm2712-rpi-5-b.dtb";
# filter = "bcm2712*"; # filter = "bcm2712*";
# }; # };
# boot.bootspec.extensions."org.nixos.systemd-boot" = lib.mkForce { # boot.bootspec.extensions."org.nixos.systemd-boot" = lib.mkForce {
# inherit (config.boot.loader.systemd-boot) sortKey; # inherit (config.boot.loader.systemd-boot) sortKey;
# devicetree = "./bcm2712-rpi-5-b.dtb"; # devicetree = "./bcm2712-rpi-5-b.dtb";
# }; # };
# }; };
# }; };
${namespace}.hardware.raspberry-pi.config = { ${namespace}.hardware.raspberry-pi.config = {
# extra-config = { # extra-config = {