diff --git a/flake.lock b/flake.lock index 9c5513e..335e4c7 100644 --- a/flake.lock +++ b/flake.lock @@ -3,44 +3,44 @@ "libcamera-src": { "flake": false, "locked": { - "lastModified": 1718617480, - "narHash": "sha256-qqEMJzMotybf1nJp1dsz3zc910Qj0TmqCm1CwuSb1VY=", + "lastModified": 1725630279, + "narHash": "sha256-KH30jmHfxXq4j2CL7kv18DYECJRp9ECuWNPnqPZajPA=", "owner": "raspberrypi", "repo": "libcamera", - "rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a", + "rev": "69a894c4adad524d3063dd027f5c4774485cf9db", "type": "github" }, "original": { "owner": "raspberrypi", + "ref": "v0.3.1+rpt20240906", "repo": "libcamera", - "rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a", "type": "github" } }, "libpisp-src": { "flake": false, "locked": { - "lastModified": 1718613892, - "narHash": "sha256-V/d4RrXoq8HNc8r/Kr1gH3E7YTZzfIdgbaJtq/Xi7uQ=", + "lastModified": 1724944683, + "narHash": "sha256-Fo2UJmQHS855YSSKKmGrsQnJzXog1cdpkIOO72yYAM4=", "owner": "raspberrypi", "repo": "libpisp", - "rev": "b567f04556801ca350331ed21a1ae3eef4675c23", + "rev": "28196ed6edcfeda88d23cc5f213d51aa6fa17bb3", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "v1.0.6", + "ref": "v1.0.7", "repo": "libpisp", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1718835956, - "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "lastModified": 1725826545, + "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", "type": "github" }, "original": { @@ -58,8 +58,8 @@ "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", - "rpi-linux-6_10_0-rc5-src": "rpi-linux-6_10_0-rc5-src", - "rpi-linux-6_6_31-src": "rpi-linux-6_6_31-src", + "rpi-linux-6_10_8-src": "rpi-linux-6_10_8-src", + "rpi-linux-6_6_47-src": "rpi-linux-6_6_47-src", "rpicam-apps-src": "rpicam-apps-src", "u-boot-src": "u-boot-src" } @@ -84,11 +84,11 @@ "rpi-firmware-nonfree-src": { "flake": false, "locked": { - "lastModified": 1708967191, - "narHash": "sha256-BGq0+cr+xBRwQM/LqiQuRWuZpQsKM5jfcrNCqWMuVzM=", + "lastModified": 1723266537, + "narHash": "sha256-T7eTKXqY9cxEMdab8Snda4CEOrEihy5uOhA6Fy+Mhnw=", "owner": "RPi-Distro", "repo": "firmware-nonfree", - "rev": "223ccf3a3ddb11b3ea829749fbbba4d65b380897", + "rev": "4b356e134e8333d073bd3802d767a825adec3807", "type": "github" }, "original": { @@ -101,28 +101,28 @@ "rpi-firmware-src": { "flake": false, "locked": { - "lastModified": 1716978780, - "narHash": "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=", + "lastModified": 1725277507, + "narHash": "sha256-DN+NlesZ8YfuVwLKQSHckvpNZxqsbKRflOcS3ShO3Ss=", "owner": "raspberrypi", "repo": "firmware", - "rev": "3590de0c181d433af368a95f15bc480bdaff8b47", + "rev": "b5eb52b343e9bc1391a8059a38e12e470c109f5c", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "1.20240529", + "ref": "1.20240902", "repo": "firmware", "type": "github" } }, - "rpi-linux-6_10_0-rc5-src": { + "rpi-linux-6_10_8-src": { "flake": false, "locked": { - "lastModified": 1719265450, - "narHash": "sha256-xd/Pz/uZFYW9hJIFKryWDE9Aks6f2EIvEDCmfk0C70c=", + "lastModified": 1725639824, + "narHash": "sha256-ogItkH2cBiNGmenJUPAhAH591qufrWh1zeqAJCNAExw=", "owner": "raspberrypi", "repo": "linux", - "rev": "f61d3aca8045e70d64b55f7b98f083738f639ad2", + "rev": "0c0217e02da43439fb08b2f6b09530723331ed15", "type": "github" }, "original": { @@ -132,19 +132,19 @@ "type": "github" } }, - "rpi-linux-6_6_31-src": { + "rpi-linux-6_6_47-src": { "flake": false, "locked": { - "lastModified": 1716545726, - "narHash": "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=", + "lastModified": 1725956269, + "narHash": "sha256-zn1Totn8NU8MCJmWRGsdarNeSo8rzscrBnhdRVMBuT0=", "owner": "raspberrypi", "repo": "linux", - "rev": "c1432b4bae5b6582f4d32ba381459f33c34d1424", + "rev": "cc50cdbcf3e8f065bd7798a92689f54578b4169f", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "stable_20240529", + "ref": "rpi-6.6.y", "repo": "linux", "type": "github" } @@ -152,16 +152,16 @@ "rpicam-apps-src": { "flake": false, "locked": { - "lastModified": 1717081637, - "narHash": "sha256-s4zJh6r3VhiquO54KWZ78dVCH1BmlphY9zEB9BidNyo=", + "lastModified": 1725543038, + "narHash": "sha256-rl5GVigiZWXkpfIteRWUMjtCaPweXRWrBrZOjQ1hiU8=", "owner": "raspberrypi", "repo": "rpicam-apps", - "rev": "49344f2a8d1817558d4e6463032fcf11be618b38", + "rev": "d7a1a13b041ef2842cd56d7e395b8c9a0ffc3bf5", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "v1.5.0", + "ref": "v1.5.1", "repo": "rpicam-apps", "type": "github" } @@ -169,14 +169,14 @@ "u-boot-src": { "flake": false, "locked": { - "lastModified": 1712055538, - "narHash": "sha256-IlaDdjKq/Pq2orzcU959h93WXRZfvKBGDO/MFw9mZMg=", + "lastModified": 1719857238, + "narHash": "sha256-mJ2TBy0Y5ZtcGFgtU5RKr0UDUp5FWzojbFb+o/ebRJU=", "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": { "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" } } }, diff --git a/flake.nix b/flake.nix index 28191a2..d4e9793 100644 --- a/flake.nix +++ b/flake.nix @@ -5,19 +5,19 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; u-boot-src = { 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; - 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; url = "github:raspberrypi/linux/rpi-6.10.y"; }; rpi-firmware-src = { flake = false; - url = "github:raspberrypi/firmware/1.20240529"; + url = "github:raspberrypi/firmware/1.20240902"; }; rpi-firmware-nonfree-src = { flake = false; @@ -29,15 +29,15 @@ }; rpicam-apps-src = { flake = false; - url = "github:raspberrypi/rpicam-apps/v1.5.0"; + url = "github:raspberrypi/rpicam-apps/v1.5.1"; }; libcamera-src = { flake = false; - url = "github:raspberrypi/libcamera/6ddd79b5bdbedc1f61007aed35391f1559f9e29a"; # v0.3.0+rpt20240617 + url = "github:raspberrypi/libcamera/v0.3.1+rpt20240906"; }; libpisp-src = { flake = false; - url = "github:raspberrypi/libpisp/v1.0.6"; + url = "github:raspberrypi/libpisp/v1.0.7"; }; }; diff --git a/overlays/default.nix b/overlays/default.nix index 320afa4..fa7c343 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,6 @@ { u-boot-src -, rpi-linux-6_6_31-src -, rpi-linux-6_10_0-rc5-src +, rpi-linux-6_6_47-src +, rpi-linux-6_10_8-src , rpi-firmware-src , rpi-firmware-nonfree-src , rpi-bluez-firmware-src @@ -9,29 +9,9 @@ final: prev: let versions = { - v6_6_31 = { - src = rpi-linux-6_6_31-src; - patches = [ - # 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; + v6_6_47.src = rpi-linux-6_6_47-src; + v6_10_8 = { + src = rpi-linux-6_10_8-src; patches = [ { name = "remove-readme-target.patch"; @@ -59,10 +39,6 @@ let src = kernel.src; defconfig = "${board}_defconfig"; 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 # parameters to `m` if possible [1]. This results in the # unspecified config option KUNIT [2] getting set to `m` which @@ -140,7 +116,7 @@ in # rpi kernels and firmware are available at # `pkgs.rpi-kernels..'. # - # For example: `pkgs.rpi-kernels.v6_6_31.bcm2712' + # For example: `pkgs.rpi-kernels.v6_6_47.bcm2712' rpi-kernels = rpi-kernels ( final.lib.cartesianProduct { board = boards; version = (builtins.attrNames versions); } diff --git a/rpi/default.nix b/rpi/default.nix index c67e131..a96d937 100644 --- a/rpi/default.nix +++ b/rpi/default.nix @@ -13,7 +13,7 @@ in options = with lib; { raspberry-pi-nix = { kernel-version = mkOption { - default = "v6_6_31"; + default = "v6_6_47"; type = types.str; description = "Kernel version to build."; };