Update dependencies (rpi-linux-6_10_12-src -> rpi-linux-6_12_1-src, raspberrypi/firmware/1.20241001 -> raspberrypi/linux/rpi-6.12.y, raspberrypi/libcamera/v0.3.1+rpt20240906 -> raspberrypi/libcamera/v0.3.2+rpt20241119)

This commit is contained in:
Sebastian Sellmeier 2024-12-04 20:34:12 +01:00
parent aaec735faf
commit ec12e29136
No known key found for this signature in database
GPG key ID: 51E2BE0CCC826F98
3 changed files with 26 additions and 37 deletions

40
flake.lock generated
View file

@ -3,17 +3,17 @@
"libcamera-src": { "libcamera-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725630279, "lastModified": 1732011234,
"narHash": "sha256-KH30jmHfxXq4j2CL7kv18DYECJRp9ECuWNPnqPZajPA=", "narHash": "sha256-pG8QdMY9UWH+UodXi1j/hVuVFRe58vvOsf7tOrrb774=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "libcamera", "repo": "libcamera",
"rev": "69a894c4adad524d3063dd027f5c4774485cf9db", "rev": "1230f78d2f6d38d812568fd27f7b985b9ff19e39",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "libcamera", "repo": "libcamera",
"rev": "69a894c4adad524d3063dd027f5c4774485cf9db", "rev": "1230f78d2f6d38d812568fd27f7b985b9ff19e39",
"type": "github" "type": "github"
} }
}, },
@ -36,11 +36,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728193676, "lastModified": 1733220138,
"narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,7 +58,7 @@
"rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
"rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
"rpi-firmware-src": "rpi-firmware-src", "rpi-firmware-src": "rpi-firmware-src",
"rpi-linux-6_10_12-src": "rpi-linux-6_10_12-src", "rpi-linux-6_12_1-src": "rpi-linux-6_12_1-src",
"rpi-linux-6_6_54-src": "rpi-linux-6_6_54-src", "rpi-linux-6_6_54-src": "rpi-linux-6_6_54-src",
"rpicam-apps-src": "rpicam-apps-src", "rpicam-apps-src": "rpicam-apps-src",
"u-boot-src": "u-boot-src" "u-boot-src": "u-boot-src"
@ -101,33 +101,33 @@
"rpi-firmware-src": { "rpi-firmware-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727798811, "lastModified": 1732625925,
"narHash": "sha256-eavbshXGYmkYR33y9FLcQMJoAYdYTESVEy0g/RRXnb0=", "narHash": "sha256-EYEp9ukEuVDE6KUYS62wy3ZcRZ/rvsIvjnT2kJDlSYY=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "firmware", "repo": "firmware",
"rev": "287e6a6c2d3b50eee3e2c5b2eacdd907e5cbe09a", "rev": "4bb9d889a9d48c7335ebe53c0b8be83285ea54b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "1.20241001", "ref": "1.20241126",
"repo": "firmware", "repo": "firmware",
"type": "github" "type": "github"
} }
}, },
"rpi-linux-6_10_12-src": { "rpi-linux-6_12_1-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728305462, "lastModified": 1733232653,
"narHash": "sha256-LtvNmGD1D5YYv+C9xxxddAeHw69o3OX/H9M7F663L74=", "narHash": "sha256-Z5EEazMYvNb+v6oCUGd+95cH7pLmwP6s5lSOFmYsXz4=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "26ee50d56618c2d98100b1bc672fd201aed4d00f", "rev": "8f073ea1b8d1914051a0d711b32adf053e43fbe0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "rpi-6.10.y", "ref": "rpi-6.12.y",
"repo": "linux", "repo": "linux",
"type": "github" "type": "github"
} }
@ -135,11 +135,11 @@
"rpi-linux-6_6_54-src": { "rpi-linux-6_6_54-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1728155174, "lastModified": 1733310783,
"narHash": "sha256-/8RjW35XQMnshjAE4Ey8j3oWzE2GOntnBYY6PlvZGhs=", "narHash": "sha256-jDPoWJCXn/ZJaOlzivb+mqPPWiOdjIPFf5+rOTWDpXg=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "12f0f28db3afe451a81a34c5a444f6841c10067c", "rev": "fda47c026dee7acd975ee2c0f7a440d4038cfaa3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -11,13 +11,13 @@
flake = false; flake = false;
url = "github:raspberrypi/linux/rpi-6.6.y"; url = "github:raspberrypi/linux/rpi-6.6.y";
}; };
rpi-linux-6_10_12-src = { rpi-linux-6_12_1-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/rpi-6.10.y"; url = "github:raspberrypi/linux/rpi-6.12.y";
}; };
rpi-firmware-src = { rpi-firmware-src = {
flake = false; flake = false;
url = "github:raspberrypi/firmware/1.20241001"; url = "github:raspberrypi/firmware/1.20241126";
}; };
rpi-firmware-nonfree-src = { rpi-firmware-nonfree-src = {
flake = false; flake = false;
@ -33,7 +33,7 @@
}; };
libcamera-src = { libcamera-src = {
flake = false; flake = false;
url = "github:raspberrypi/libcamera/69a894c4adad524d3063dd027f5c4774485cf9db"; # v0.3.1+rpt20240906 url = "github:raspberrypi/libcamera/1230f78d2f6d38d812568fd27f7b985b9ff19e39"; # v0.3.2+rpt20241119
}; };
libpisp-src = { libpisp-src = {
flake = false; flake = false;

View file

@ -1,6 +1,6 @@
{ u-boot-src { u-boot-src
, rpi-linux-6_6_54-src , rpi-linux-6_6_54-src
, rpi-linux-6_10_12-src , rpi-linux-6_12_1-src
, rpi-firmware-src , rpi-firmware-src
, rpi-firmware-nonfree-src , rpi-firmware-nonfree-src
, rpi-bluez-firmware-src , rpi-bluez-firmware-src
@ -10,18 +10,7 @@ final: prev:
let let
versions = { versions = {
v6_6_54.src = rpi-linux-6_6_54-src; v6_6_54.src = rpi-linux-6_6_54-src;
v6_10_12 = { v6_10_12 = rpi-linux-6_12_1-src;
src = rpi-linux-6_10_12-src;
patches = [
{
name = "remove-readme-target.patch";
patch = final.fetchpatch {
url = "https://github.com/raspberrypi/linux/commit/3c0fd51d184f1748b83d28e1113265425c19bcb5.patch";
hash = "sha256-v7uZOmPCUp2i7NGVgjqnQYe6dEBD+aATuP/oRs9jfuk=";
};
}
];
};
}; };
boards = [ "bcm2711" "bcm2712" ]; boards = [ "bcm2711" "bcm2712" ];