|
5 | 5 | nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
6 | 6 | u-boot-src = {
|
7 | 7 | flake = false;
|
8 |
| - url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"; |
| 8 | + url = "https://ftp.denx.de/pub/u-boot/u-boot-2025.01.tar.bz2"; |
9 | 9 | };
|
10 |
| - rpi-linux-stable-src = { |
11 |
| - flake = false; |
12 |
| - url = "github:raspberrypi/linux/stable_20241008"; |
13 |
| - }; |
14 |
| - rpi-linux-6_6_67-src = { |
| 10 | + rpi-linux-6_6_y-src = { |
15 | 11 | flake = false;
|
16 | 12 | url = "github:raspberrypi/linux/rpi-6.6.y";
|
17 | 13 | };
|
18 |
| - rpi-linux-6_12_11-src = { |
| 14 | + rpi-linux-6_12_y-src = { |
19 | 15 | flake = false;
|
20 | 16 | url = "github:raspberrypi/linux/rpi-6.12.y";
|
21 | 17 | };
|
22 |
| - rpi-firmware-src = { |
| 18 | + rpi-firmware-6_6_y-src = { |
| 19 | + flake = false; |
| 20 | + url = "github:raspberrypi/firmware/master"; |
| 21 | + }; |
| 22 | + rpi-firmware-6_12_y-src = { |
23 | 23 | flake = false;
|
24 |
| - url = "github:raspberrypi/firmware/1.20241008"; |
| 24 | + url = "github:raspberrypi/firmware/next"; |
25 | 25 | };
|
26 | 26 | rpi-firmware-nonfree-src = {
|
27 | 27 | flake = false;
|
|
33 | 33 | };
|
34 | 34 | rpicam-apps-src = {
|
35 | 35 | flake = false;
|
36 |
| - url = "github:raspberrypi/rpicam-apps/v1.5.2"; |
| 36 | + url = "github:raspberrypi/rpicam-apps/v1.5.3"; |
37 | 37 | };
|
38 | 38 | libcamera-src = {
|
39 | 39 | flake = false;
|
40 |
| - url = "github:raspberrypi/libcamera/69a894c4adad524d3063dd027f5c4774485cf9db"; # v0.3.1+rpt20240906 |
| 40 | + url = "github:raspberrypi/libcamera/v0.3.2+rpt20241119"; |
41 | 41 | };
|
42 | 42 | libpisp-src = {
|
43 | 43 | flake = false;
|
|
51 | 51 | system = "aarch64-linux";
|
52 | 52 | overlays = with self.overlays; [ core libcamera ];
|
53 | 53 | };
|
| 54 | + lock = builtins.fromJSON (builtins.readFile ./flake.lock); |
| 55 | + lib = srcs.nixpkgs.lib; |
| 56 | + inputs = lib.recursiveUpdate (builtins.removeAttrs srcs [ "self" ]) { inherit lock; }; |
54 | 57 | in
|
55 | 58 | {
|
56 | 59 | overlays = {
|
57 |
| - core = import ./overlays (builtins.removeAttrs srcs [ "self" ]); |
58 |
| - libcamera = import ./overlays/libcamera.nix (builtins.removeAttrs srcs [ "self" ]); |
| 60 | + core = import ./overlays inputs; |
| 61 | + libcamera = import ./overlays/libcamera.nix inputs; |
59 | 62 | };
|
60 | 63 | nixosModules = {
|
61 | 64 | raspberry-pi = import ./rpi {
|
62 |
| - inherit pinned; |
| 65 | + inherit pinned inputs; |
63 | 66 | core-overlay = self.overlays.core;
|
64 | 67 | libcamera-overlay = self.overlays.libcamera;
|
65 | 68 | };
|
|
86 | 89 | in
|
87 | 90 | {
|
88 | 91 | example-sd-image = self.nixosConfigurations.rpi-example.config.system.build.sdImage;
|
89 |
| - firmware = pinned.raspberrypifw; |
90 | 92 | libcamera = pinned.libcamera;
|
91 | 93 | wireless-firmware = pinned.raspberrypiWirelessFirmware;
|
92 | 94 | uboot-rpi-arm64 = pinned.uboot-rpi-arm64;
|
|
0 commit comments