nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-08 19:46:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bump rpi sources

Browse source
This commit is contained in:
Travis Staton 2024-05-11 14:21:52 -04:00
parent 8fc9cbd3e4
commit e858a137fd
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.nix
View file

@ -5,15 +5,15 @@
nixpkgs.url = "github:NixOS/nixpkgs/9a9960b98418f8c385f52de3b09a63f9c561427a"; nixpkgs.url = "github:NixOS/nixpkgs/9a9960b98418f8c385f52de3b09a63f9c561427a";
u-boot-src = { u-boot-src = {
flake = false; flake = false;
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.01.tar.bz2"; url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2";
}; };
rpi-linux-6_1-src = { rpi-linux-6_6-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/stable_20231123"; url = "github:raspberrypi/linux/stable_20240423";
}; };
rpi-firmware-src = { rpi-firmware-src = {
flake = false; flake = false;
url = "github:raspberrypi/firmware/7e6decce72fdff51923e9203db46716835ae889a"; url = "github:raspberrypi/firmware/1.20240424";
}; };
rpi-firmware-nonfree-src = { rpi-firmware-nonfree-src = {
flake = false; flake = false;
@ -25,21 +25,21 @@
}; };
libcamera-apps-src = { libcamera-apps-src = {
flake = false; flake = false;
url = "github:raspberrypi/libcamera-apps/v1.4.1"; url = "github:raspberrypi/libcamera-apps/v1.4.4";
}; };
libcamera-src = { libcamera-src = {
flake = false; flake = false;
url = "github:raspberrypi/libcamera/563cd78e1c9858769f7e4cc2628e2515836fd6e7"; # v0.1.0+rpt20231122 url = "github:raspberrypi/libcamera/eb00c13d7c9f937732305d47af5b8ccf895e700f"; # v0.2.0+rpt20240418
}; };
libpisp-src = { libpisp-src = {
flake = false; flake = false;
url = "github:raspberrypi/libpisp/v1.0.3"; url = "github:raspberrypi/libpisp/v1.0.5";
}; };
}; };
outputs = srcs@{ self, ... }: outputs = srcs@{ self, ... }:
let let
pinned = import nixpkgs { pinned = import srcs.nixpkgs {
system = "aarch64-linux"; system = "aarch64-linux";
overlays = with self.overlays; [ core libcamera ]; overlays = with self.overlays; [ core libcamera ];
}; };

11
overlays/default.nix
View file

@ -1,5 +1,5 @@
{ u-boot-src { u-boot-src
, rpi-linux-6_1-src , rpi-linux-6_6-src
, rpi-firmware-src , rpi-firmware-src
, rpi-firmware-nonfree-src , rpi-firmware-nonfree-src
, rpi-bluez-firmware-src , rpi-bluez-firmware-src
@ -8,7 +8,7 @@
final: prev: final: prev:
let let
# The version to stick at `pkgs.rpi-kernels.latest' # The version to stick at `pkgs.rpi-kernels.latest'
latest = "v6_1_63"; latest = "v6_6_28";
# Helpers for building the `pkgs.rpi-kernels' map. # Helpers for building the `pkgs.rpi-kernels' map.
rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }: rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }:
@ -43,7 +43,7 @@ in
defconfig = "rpi_arm64_defconfig"; defconfig = "rpi_arm64_defconfig";
extraMeta.platforms = [ "aarch64-linux" ]; extraMeta.platforms = [ "aarch64-linux" ];
filesToInstall = [ "u-boot.bin" ]; filesToInstall = [ "u-boot.bin" ];
version = "2024.01"; version = "2024.04";
patches = [ ]; patches = [ ];
makeFlags = [ ]; makeFlags = [ ];
src = u-boot-src; src = u-boot-src;
@ -69,8 +69,8 @@ in
# #
# For example: `pkgs.rpi-kernels.v5_15_87.kernel' # For example: `pkgs.rpi-kernels.v5_15_87.kernel'
rpi-kernels = rpi-kernels [{ rpi-kernels = rpi-kernels [{
version = "6.1.63"; version = "6.6.28";
kernel = rpi-linux-6_1-src; kernel = rpi-linux-6_6-src;
fw = rpi-firmware-src; fw = rpi-firmware-src;
wireless-fw = import ./raspberrypi-wireless-firmware.nix { wireless-fw = import ./raspberrypi-wireless-firmware.nix {
bluez-firmware = rpi-bluez-firmware-src; bluez-firmware = rpi-bluez-firmware-src;
@ -96,6 +96,7 @@ in
# [2] https://github.com/raspberrypi/linux/blob/1.20230405/lib/kunit/Kconfig#L5-L14 # [2] https://github.com/raspberrypi/linux/blob/1.20230405/lib/kunit/Kconfig#L5-L14
# [3] https://github.com/raspberrypi/linux/blob/bb63dc31e48948bc2649357758c7a152210109c4/drivers/gpu/drm/vc4/Kconfig#L38-L52 # [3] https://github.com/raspberrypi/linux/blob/bb63dc31e48948bc2649357758c7a152210109c4/drivers/gpu/drm/vc4/Kconfig#L38-L52
KUNIT = no; KUNIT = no;
GPIO_PWM = no;
}; };
}; };
}] // { }] // {