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: packages version bump

Browse source
This commit is contained in:
adminy 2024-09-10 14:35:02 +01:00
parent 97c85054d1
commit 0ffba0a5bf
4 changed files with 52 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

74
flake.lock generated
View file

@ -3,44 +3,44 @@
"libcamera-src": { "libcamera-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1718617480, "lastModified": 1725630279,
"narHash": "sha256-qqEMJzMotybf1nJp1dsz3zc910Qj0TmqCm1CwuSb1VY=", "narHash": "sha256-KH30jmHfxXq4j2CL7kv18DYECJRp9ECuWNPnqPZajPA=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "libcamera", "repo": "libcamera",
"rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a", "rev": "69a894c4adad524d3063dd027f5c4774485cf9db",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "v0.3.1+rpt20240906",
"repo": "libcamera", "repo": "libcamera",
"rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a",
"type": "github" "type": "github"
} }
}, },
"libpisp-src": { "libpisp-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1718613892, "lastModified": 1724944683,
"narHash": "sha256-V/d4RrXoq8HNc8r/Kr1gH3E7YTZzfIdgbaJtq/Xi7uQ=", "narHash": "sha256-Fo2UJmQHS855YSSKKmGrsQnJzXog1cdpkIOO72yYAM4=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "libpisp", "repo": "libpisp",
"rev": "b567f04556801ca350331ed21a1ae3eef4675c23", "rev": "28196ed6edcfeda88d23cc5f213d51aa6fa17bb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "v1.0.6", "ref": "v1.0.7",
"repo": "libpisp", "repo": "libpisp",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718835956, "lastModified": 1725826545,
"narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,8 +58,8 @@
"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_0-rc5-src": "rpi-linux-6_10_0-rc5-src", "rpi-linux-6_10_8-src": "rpi-linux-6_10_8-src",
"rpi-linux-6_6_31-src": "rpi-linux-6_6_31-src", "rpi-linux-6_6_47-src": "rpi-linux-6_6_47-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"
} }
@ -84,11 +84,11 @@
"rpi-firmware-nonfree-src": { "rpi-firmware-nonfree-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708967191, "lastModified": 1723266537,
"narHash": "sha256-BGq0+cr+xBRwQM/LqiQuRWuZpQsKM5jfcrNCqWMuVzM=", "narHash": "sha256-T7eTKXqY9cxEMdab8Snda4CEOrEihy5uOhA6Fy+Mhnw=",
"owner": "RPi-Distro", "owner": "RPi-Distro",
"repo": "firmware-nonfree", "repo": "firmware-nonfree",
"rev": "223ccf3a3ddb11b3ea829749fbbba4d65b380897", "rev": "4b356e134e8333d073bd3802d767a825adec3807",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,28 +101,28 @@
"rpi-firmware-src": { "rpi-firmware-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716978780, "lastModified": 1725277507,
"narHash": "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=", "narHash": "sha256-DN+NlesZ8YfuVwLKQSHckvpNZxqsbKRflOcS3ShO3Ss=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "firmware", "repo": "firmware",
"rev": "3590de0c181d433af368a95f15bc480bdaff8b47", "rev": "b5eb52b343e9bc1391a8059a38e12e470c109f5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "1.20240529", "ref": "1.20240902",
"repo": "firmware", "repo": "firmware",
"type": "github" "type": "github"
} }
}, },
"rpi-linux-6_10_0-rc5-src": { "rpi-linux-6_10_8-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719265450, "lastModified": 1725639824,
"narHash": "sha256-xd/Pz/uZFYW9hJIFKryWDE9Aks6f2EIvEDCmfk0C70c=", "narHash": "sha256-ogItkH2cBiNGmenJUPAhAH591qufrWh1zeqAJCNAExw=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "f61d3aca8045e70d64b55f7b98f083738f639ad2", "rev": "0c0217e02da43439fb08b2f6b09530723331ed15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,19 +132,19 @@
"type": "github" "type": "github"
} }
}, },
"rpi-linux-6_6_31-src": { "rpi-linux-6_6_47-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716545726, "lastModified": 1725956269,
"narHash": "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=", "narHash": "sha256-zn1Totn8NU8MCJmWRGsdarNeSo8rzscrBnhdRVMBuT0=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "linux", "repo": "linux",
"rev": "c1432b4bae5b6582f4d32ba381459f33c34d1424", "rev": "cc50cdbcf3e8f065bd7798a92689f54578b4169f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "stable_20240529", "ref": "rpi-6.6.y",
"repo": "linux", "repo": "linux",
"type": "github" "type": "github"
} }
@ -152,16 +152,16 @@
"rpicam-apps-src": { "rpicam-apps-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717081637, "lastModified": 1725543038,
"narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=", "narHash": "sha256-rl5GVigiZWXkpfIteRWUMjtCaPweXRWrBrZOjQ1hiU8=",
"owner": "raspberrypi", "owner": "raspberrypi",
"repo": "rpicam-apps", "repo": "rpicam-apps",
"rev": "49344f2a8d1817558d4e6463032fcf11be618b38", "rev": "d7a1a13b041ef2842cd56d7e395b8c9a0ffc3bf5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "raspberrypi", "owner": "raspberrypi",
"ref": "v1.5.0", "ref": "v1.5.1",
"repo": "rpicam-apps", "repo": "rpicam-apps",
"type": "github" "type": "github"
} }
@ -169,14 +169,14 @@
"u-boot-src": { "u-boot-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1712055538, "lastModified": 1719857238,
"narHash": "sha256-IlaDdjKq/Pq2orzcU959h93WXRZfvKBGDO/MFw9mZMg=", "narHash": "sha256-mJ2TBy0Y5ZtcGFgtU5RKr0UDUp5FWzojbFb+o/ebRJU=",
"type": "tarball", "type": "tarball",
"url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2" "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.04.tar.bz2" "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2"
} }
} }
}, },

16
flake.nix
View file

@ -5,19 +5,19 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; 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.04.tar.bz2"; url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2";
}; };
rpi-linux-6_6_31-src = { rpi-linux-6_6_47-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/stable_20240529"; url = "github:raspberrypi/linux/rpi-6.6.y";
}; };
rpi-linux-6_10_0-rc5-src = { rpi-linux-6_10_8-src = {
flake = false; flake = false;
url = "github:raspberrypi/linux/rpi-6.10.y"; url = "github:raspberrypi/linux/rpi-6.10.y";
}; };
rpi-firmware-src = { rpi-firmware-src = {
flake = false; flake = false;
url = "github:raspberrypi/firmware/1.20240529"; url = "github:raspberrypi/firmware/1.20240902";
}; };
rpi-firmware-nonfree-src = { rpi-firmware-nonfree-src = {
flake = false; flake = false;
@ -29,15 +29,15 @@
}; };
rpicam-apps-src = { rpicam-apps-src = {
flake = false; flake = false;
url = "github:raspberrypi/rpicam-apps/v1.5.0"; url = "github:raspberrypi/rpicam-apps/v1.5.1";
}; };
libcamera-src = { libcamera-src = {
flake = false; flake = false;
url = "github:raspberrypi/libcamera/6ddd79b5bdbedc1f61007aed35391f1559f9e29a"; # v0.3.0+rpt20240617 url = "github:raspberrypi/libcamera/v0.3.1+rpt20240906";
}; };
libpisp-src = { libpisp-src = {
flake = false; flake = false;
url = "github:raspberrypi/libpisp/v1.0.6"; url = "github:raspberrypi/libpisp/v1.0.7";
}; };
}; };

36
overlays/default.nix
View file

@ -1,6 +1,6 @@
{ u-boot-src { u-boot-src
, rpi-linux-6_6_31-src , rpi-linux-6_6_47-src
, rpi-linux-6_10_0-rc5-src , rpi-linux-6_10_8-src
, rpi-firmware-src , rpi-firmware-src
, rpi-firmware-nonfree-src , rpi-firmware-nonfree-src
, rpi-bluez-firmware-src , rpi-bluez-firmware-src
@ -9,29 +9,9 @@
final: prev: final: prev:
let let
versions = { versions = {
v6_6_31 = { v6_6_47.src = rpi-linux-6_6_47-src;
src = rpi-linux-6_6_31-src; v6_10_8 = {
patches = [ src = rpi-linux-6_10_8-src;
# Fix compilation errors due to incomplete patch backport.
# https://github.com/raspberrypi/linux/pull/6223
{
name = "gpio-pwm_-_pwm_apply_might_sleep.patch";
patch = final.fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/879f34b88c60dd59765caa30576cb5bfb8e73c56.patch";
hash = "sha256-HlOkM9EFmlzOebCGoj7lNV5hc0wMjhaBFFZvaRCI0lI=";
};
}
{
name = "ir-rx51_-_pwm_apply_might_sleep.patch";
patch = final.fetchpatch {
url = "https://github.com/peat-psuwit/rpi-linux/commit/23431052d2dce8084b72e399fce82b05d86b847f.patch";
hash = "sha256-UDX/BJCJG0WVndP/6PbPK+AZsfU3vVxDCrpn1kb1kqE=";
};
}
];
};
v6_10_0-rc5 = {
src = rpi-linux-6_10_0-rc5-src;
patches = [ patches = [
{ {
name = "remove-readme-target.patch"; name = "remove-readme-target.patch";
@ -59,10 +39,6 @@ let
src = kernel.src; src = kernel.src;
defconfig = "${board}_defconfig"; defconfig = "${board}_defconfig";
structuredExtraConfig = with final.lib.kernel; { structuredExtraConfig = with final.lib.kernel; {
# Workaround https://github.com/raspberrypi/linux/issues/6198
# Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in
# DRM_KMS_HELPER=y.
BACKLIGHT_CLASS_DEVICE = yes;
# The perl script to generate kernel options sets unspecified # The perl script to generate kernel options sets unspecified
# parameters to `m` if possible [1]. This results in the # parameters to `m` if possible [1]. This results in the
# unspecified config option KUNIT [2] getting set to `m` which # unspecified config option KUNIT [2] getting set to `m` which
@ -140,7 +116,7 @@ in
# rpi kernels and firmware are available at # rpi kernels and firmware are available at
# `pkgs.rpi-kernels.<VERSION>.<BOARD>'. # `pkgs.rpi-kernels.<VERSION>.<BOARD>'.
# #
# For example: `pkgs.rpi-kernels.v6_6_31.bcm2712' # For example: `pkgs.rpi-kernels.v6_6_47.bcm2712'
rpi-kernels = rpi-kernels ( rpi-kernels = rpi-kernels (
final.lib.cartesianProduct final.lib.cartesianProduct
{ board = boards; version = (builtins.attrNames versions); } { board = boards; version = (builtins.attrNames versions); }

2
rpi/default.nix
View file

@ -13,7 +13,7 @@ in
options = with lib; { options = with lib; {
raspberry-pi-nix = { raspberry-pi-nix = {
kernel-version = mkOption { kernel-version = mkOption {
default = "v6_6_31"; default = "v6_6_47";
type = types.str; type = types.str;
description = "Kernel version to build."; description = "Kernel version to build.";
}; };