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

chore: return to stable versions, undo compression, fix libcamera version

Browse source
This commit is contained in:
adminy 2024-06-22 23:49:48 +01:00
parent 4240bff280
commit b9c9972ec6
4 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -6,14 +6,14 @@
"lastModified": 1717081637, "lastModified": 1717081637,
"narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=", "narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "libcamera-apps", "repo": "rpicam-apps",
"rev": "49344f2a8d1817558d4e6463032fcf11be618b38", "rev": "49344f2a8d1817558d4e6463032fcf11be618b38",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "v1.5.0", "ref": "v1.5.0",
"repo": "libcamera-apps", "repo": "rpicam-apps",
"type": "github" "type": "github"
} }
}, },
@ -53,17 +53,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718732645, "lastModified": 1718835956,
"narHash": "sha256-Zv8FapPPVVP5sqty4DWxSaL4p8sFuoAEglelBtSIhm0=", "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9be7393d7204ba14ead6ec4f0381cc91bfb2aa24", "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9be7393d7204ba14ead6ec4f0381cc91bfb2aa24",
"type": "github" "type": "github"
} }
}, },
@ -92,8 +92,8 @@
}, },
"original": { "original": {
"owner": "RPi-Distro", "owner": "RPi-Distro",
"ref": "bookworm",
"repo": "bluez-firmware", "repo": "bluez-firmware",
"rev": "78d6a07730e2d20c035899521ab67726dc028e1c",
"type": "github" "type": "github"
} }
}, },
@ -109,8 +109,8 @@
}, },
"original": { "original": {
"owner": "RPi-Distro", "owner": "RPi-Distro",
"ref": "bookworm",
"repo": "firmware-nonfree", "repo": "firmware-nonfree",
"rev": "223ccf3a3ddb11b3ea829749fbbba4d65b380897",
"type": "github" "type": "github"
} }
}, },
@ -134,17 +134,17 @@
"rpi-linux-6_6-src": { "rpi-linux-6_6-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1718722155, "lastModified": 1716545726,
"narHash": "sha256-WKlxHAAvDRN10M9pBmF3rNmXKd3uT2hv2/uxASa1LnQ=", "narHash": "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "da87f91ad8450ccc5274cd7b6ba8d823b396c96f", "rev": "c1432b4bae5b6582f4d32ba381459f33c34d1424",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "stable_20240529",
"repo": "linux", "repo": "linux",
"rev": "da87f91ad8450ccc5274cd7b6ba8d823b396c96f",
"type": "github" "type": "github"
} }
}, },

10
flake.nix
View file

@ -2,14 +2,14 @@
description = "raspberry-pi nixos configuration"; description = "raspberry-pi nixos configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/9be7393d7204ba14ead6ec4f0381cc91bfb2aa24"; # 2024-06-18 nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
u-boot-src = { u-boot-src = {
flake = false; flake = false;
url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07-rc4.tar.bz2"; url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07-rc4.tar.bz2";
}; };
rpi-linux-6_6-src = { rpi-linux-6_6-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/da87f91ad8450ccc5274cd7b6ba8d823b396c96f"; # 2024-06-17 url = "github:raspberrypi/linux/stable_20240529";
}; };
rpi-firmware-src = { rpi-firmware-src = {
flake = false; flake = false;
@ -17,15 +17,15 @@
}; };
rpi-firmware-nonfree-src = { rpi-firmware-nonfree-src = {
flake = false; flake = false;
url = "github:RPi-Distro/firmware-nonfree/223ccf3a3ddb11b3ea829749fbbba4d65b380897"; # 1:20230625-2+rpt2 url = "github:RPi-Distro/firmware-nonfree/bookworm";
}; };
rpi-bluez-firmware-src = { rpi-bluez-firmware-src = {
flake = false; flake = false;
url = "github:RPi-Distro/bluez-firmware/78d6a07730e2d20c035899521ab67726dc028e1c"; # 1.2-9+rpt3 url = "github:RPi-Distro/bluez-firmware/bookworm";
}; };
libcamera-apps-src = { libcamera-apps-src = {
flake = false; flake = false;
url = "github:raspberrypi/libcamera-apps/v1.5.0"; url = "github:raspberrypi/rpicam-apps/v1.5.0";
}; };
libcamera-src = { libcamera-src = {
flake = false; flake = false;

5
overlays/default.nix
View file

@ -70,6 +70,11 @@ let
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { }; rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
in in
{ {
# disable firmware compression so that brcm firmware can be found at
# the path expected by raspberry pi firmware/device tree
compressFirmwareXz = x: x;
compressFirmwareZstd = x: x;
# provide generic rpi arm64 u-boot # provide generic rpi arm64 u-boot
uboot_rpi_arm64 = prev.buildUBoot rec { uboot_rpi_arm64 = prev.buildUBoot rec {
defconfig = "rpi_arm64_defconfig"; defconfig = "rpi_arm64_defconfig";

2
overlays/libcamera.nix
View file

@ -11,7 +11,7 @@ final: prev:
libpisp = final.stdenv.mkDerivation { libpisp = final.stdenv.mkDerivation {
name = "libpisp"; name = "libpisp";
version = "1.0.5"; version = "1.0.6";
src = libpisp-src; src = libpisp-src;
nativeBuildInputs = with final; [ pkg-config meson ninja ]; nativeBuildInputs = with final; [ pkg-config meson ninja ];
buildInputs = with final; [ nlohmann_json boost ]; buildInputs = with final; [ nlohmann_json boost ];