mirror of
https://github.com/nix-community/raspberry-pi-nix.git
synced 2025-11-08 19:46:03 +01:00
chore: bump libs & fix libcamera, fix upstream nixpkgs
This commit is contained in:
adminy
parent
6045de5f79
commit
c2388c307b
8 changed files with 171 additions and 142 deletions
|
|
@ -7,70 +7,12 @@
|
|||
}:
|
||||
final: prev:
|
||||
let
|
||||
# The version to stick at `pkgs.rpi-kernels.latest'
|
||||
latest = "v6_6_28";
|
||||
# The version to stick at `pkgs.rpi-kernels.latest_bcm271x'
|
||||
latest = "v6_6_34";
|
||||
|
||||
# Helpers for building the `pkgs.rpi-kernels' map.
|
||||
rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null }:
|
||||
let
|
||||
new-kernel = prev.linux_rpi4.override {
|
||||
argsOverride = {
|
||||
src = kernel;
|
||||
inherit version;
|
||||
modDirVersion = version;
|
||||
} // (if builtins.isNull argsOverride then { } else argsOverride);
|
||||
};
|
||||
new-fw = prev.raspberrypifw.overrideAttrs (oldfw: { src = fw; });
|
||||
new-wireless-fw = final.callPackage wireless-fw { };
|
||||
version-slug = builtins.replaceStrings [ "." ] [ "_" ] version;
|
||||
in
|
||||
{
|
||||
"v${version-slug}" = {
|
||||
kernel = new-kernel;
|
||||
firmware = new-fw;
|
||||
wireless-firmware = new-wireless-fw;
|
||||
};
|
||||
};
|
||||
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
|
||||
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
|
||||
uboot_rpi_arm64 = prev.buildUBoot rec {
|
||||
defconfig = "rpi_arm64_defconfig";
|
||||
extraMeta.platforms = [ "aarch64-linux" ];
|
||||
filesToInstall = [ "u-boot.bin" ];
|
||||
version = "2024.04";
|
||||
patches = [ ];
|
||||
makeFlags = [ ];
|
||||
src = u-boot-src;
|
||||
# In raspberry pi sbcs the firmware manipulates the device tree in
|
||||
# a variety of ways before handing it off to the linux kernel. [1]
|
||||
# Since we have installed u-boot in place of a linux kernel we may
|
||||
# pass the device tree passed by the firmware onto the kernel, or
|
||||
# we may provide the kernel with a device tree of our own. This
|
||||
# configuration uses the device tree provided by firmware so that
|
||||
# we don't have to be aware of all manipulation done by the
|
||||
# firmware and attempt to mimic it.
|
||||
#
|
||||
# 1. https://forums.raspberrypi.com/viewtopic.php?t=329799#p1974233
|
||||
};
|
||||
|
||||
# default to latest firmware
|
||||
raspberrypiWirelessFirmware = final.rpi-kernels.latest.wireless-firmware;
|
||||
raspberrypifw = final.rpi-kernels.latest.firmware;
|
||||
|
||||
} // {
|
||||
# rpi kernels and firmware are available at
|
||||
# `pkgs.rpi-kernels.<VERSION>.{kernel,firmware,wireless-firmware}'.
|
||||
#
|
||||
# For example: `pkgs.rpi-kernels.v5_15_87.kernel'
|
||||
rpi-kernels = rpi-kernels [{
|
||||
version = "6.6.28";
|
||||
kernel-config = board: {
|
||||
inherit board;
|
||||
version = builtins.replaceStrings ["v" "_"] ["" "."] latest;
|
||||
kernel = rpi-linux-6_6-src;
|
||||
fw = rpi-firmware-src;
|
||||
wireless-fw = import ./raspberrypi-wireless-firmware.nix {
|
||||
|
|
@ -100,7 +42,72 @@ in
|
|||
GPIO_PWM = no;
|
||||
};
|
||||
};
|
||||
}] // {
|
||||
latest = final.rpi-kernels."${latest}";
|
||||
};
|
||||
|
||||
# Helpers for building the `pkgs.rpi-kernels' map.
|
||||
rpi-kernel = { kernel, version, fw, wireless-fw, argsOverride ? null, board }:
|
||||
let
|
||||
new-kernel = prev.linux_rpi4.override {
|
||||
argsOverride = {
|
||||
src = kernel;
|
||||
inherit version;
|
||||
modDirVersion = version;
|
||||
kernelPatches = [];
|
||||
defconfig = "${board}_defconfig";
|
||||
postFixup = "";
|
||||
} // (if builtins.isNull argsOverride then { } else argsOverride);
|
||||
};
|
||||
new-fw = prev.raspberrypifw.overrideAttrs (oldfw: { src = fw; });
|
||||
new-wireless-fw = final.callPackage wireless-fw { };
|
||||
version-slug = builtins.replaceStrings [ "." ] [ "_" ] version;
|
||||
in
|
||||
{
|
||||
"latest_${board}" = {
|
||||
kernel = new-kernel;
|
||||
firmware = new-fw;
|
||||
wireless-firmware = new-wireless-fw;
|
||||
};
|
||||
};
|
||||
rpi-kernels = builtins.foldl' (b: a: b // rpi-kernel a) { };
|
||||
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
|
||||
uboot_rpi_arm64 = prev.buildUBoot rec {
|
||||
defconfig = "rpi_arm64_defconfig";
|
||||
extraMeta.platforms = [ "aarch64-linux" ];
|
||||
filesToInstall = [ "u-boot.bin" ];
|
||||
version = "2024.07-rc4";
|
||||
patches = [ ];
|
||||
makeFlags = [ ];
|
||||
src = u-boot-src;
|
||||
# In raspberry pi sbcs the firmware manipulates the device tree in
|
||||
# a variety of ways before handing it off to the linux kernel. [1]
|
||||
# Since we have installed u-boot in place of a linux kernel we may
|
||||
# pass the device tree passed by the firmware onto the kernel, or
|
||||
# we may provide the kernel with a device tree of our own. This
|
||||
# configuration uses the device tree provided by firmware so that
|
||||
# we don't have to be aware of all manipulation done by the
|
||||
# firmware and attempt to mimic it.
|
||||
#
|
||||
# 1. https://forums.raspberrypi.com/viewtopic.php?t=329799#p1974233
|
||||
};
|
||||
|
||||
# default to latest firmware
|
||||
raspberrypiWirelessFirmware = final.rpi-kernels.latest_bcm2712.wireless-firmware;
|
||||
raspberrypifw = final.rpi-kernels.latest_bcm2712.firmware;
|
||||
|
||||
} // {
|
||||
# rpi kernels and firmware are available at
|
||||
# `pkgs.rpi-kernels.<VERSION>_<BOARD>.{kernel,firmware,wireless-firmware}'.
|
||||
#
|
||||
# For example: `pkgs.rpi-kernels.latest_bcm2712.kernel'
|
||||
rpi-kernels = rpi-kernels [
|
||||
(kernel-config "bcm2711")
|
||||
(kernel-config "bcm2712")
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,12 @@
|
|||
{ libcamera-apps-src
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, pkg-config
|
||||
, libjpeg
|
||||
, libtiff
|
||||
, libpng
|
||||
, libcamera
|
||||
, libepoxy
|
||||
, boost
|
||||
, libexif
|
||||
, ninja
|
||||
}:
|
||||
|
||||
{ libcamera-apps-src, lib, pkgs, stdenv }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcamera-apps";
|
||||
version = "v1.4.1";
|
||||
version = "v1.5.0";
|
||||
|
||||
src = libcamera-apps-src;
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ];
|
||||
buildInputs = [ libjpeg libtiff libcamera libepoxy boost libexif libpng ninja ];
|
||||
nativeBuildInputs = with pkgs; [ meson pkg-config ];
|
||||
buildInputs = with pkgs; [ libjpeg libtiff libcamera libepoxy boost libexif libpng ninja ];
|
||||
mesonFlags = [
|
||||
"-Denable_qt=false"
|
||||
"-Denable_opencv=false"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ final: prev:
|
|||
|
||||
libpisp = final.stdenv.mkDerivation {
|
||||
name = "libpisp";
|
||||
version = "1.0.3";
|
||||
version = "1.0.5";
|
||||
src = libpisp-src;
|
||||
nativeBuildInputs = with final; [ pkg-config meson ninja ];
|
||||
buildInputs = with final; [ nlohmann_json boost ];
|
||||
|
|
@ -22,9 +22,30 @@ final: prev:
|
|||
};
|
||||
|
||||
libcamera = prev.libcamera.overrideAttrs (old: {
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
src = libcamera-src;
|
||||
buildInputs = old.buildInputs ++ (with final; [ libpisp ]);
|
||||
buildInputs = old.buildInputs ++ (with final; [
|
||||
libpisp openssl libtiff
|
||||
(python3.withPackages (ps: with ps; [
|
||||
python3-gnutls pybind11 pyyaml ply
|
||||
]))
|
||||
libglibutil gst_all_1.gst-plugins-base
|
||||
|
||||
]);
|
||||
patches = [ ];
|
||||
mesonFlags = [
|
||||
"--buildtype=release"
|
||||
"-Dpipelines=rpi/vc4,rpi/pisp"
|
||||
"-Dipas=rpi/vc4,rpi/pisp"
|
||||
"-Dv4l2=true"
|
||||
"-Dgstreamer=enabled"
|
||||
"-Dtest=false"
|
||||
"-Dlc-compliance=disabled"
|
||||
"-Dcam=disabled"
|
||||
"-Dqcam=disabled"
|
||||
"-Ddocumentation=enabled"
|
||||
"-Dpycamera=enabled"
|
||||
];
|
||||
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ bluez-firmware, firmware-nonfree }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
{ lib, stdenvNoCC }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "raspberrypi-wireless-firmware";
|
||||
version = "2023-11-15";
|
||||
version = "2024-02-26";
|
||||
|
||||
srcs = [ ];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue