From d9b0c54edca942d870c15e2aa2af3d7315f85852 Mon Sep 17 00:00:00 2001 From: James Walker Date: Tue, 1 Oct 2024 13:34:13 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20aristotle:=20fix=20kernel=20buil?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 129 +++++++++++++------------- flake.nix | 2 +- nix/hosts/aristotle/configuration.nix | 3 + 3 files changed, 68 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 4524244..1b4c0c0 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1727003835, - "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", + "lastModified": 1727707210, + "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", + "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", "type": "github" }, "original": { @@ -30,11 +30,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1718194053, - "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", + "lastModified": 1727447169, + "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", "owner": "serokell", "repo": "deploy-rs", - "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", + "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1727370457, - "narHash": "sha256-YlTm2rgsf+UxxNnUCE/B/8bL9A3HOfPZD8l8EjlWm/Y=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "57e6b30d181ae6baff0909a61544ecbe1f642936", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -153,44 +153,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", "repo": "libcamera", - "rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a", + "rev": "69a894c4adad524d3063dd027f5c4774485cf9db", "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" } }, "nixlib": { "locked": { - "lastModified": 1726966855, - "narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", + "lastModified": 1727571693, + "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", + "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1727312535, - "narHash": "sha256-exnTgS6OBYvEa8v5x8UsLQK2ERdDFwXNFQHoT2cqycY=", + "lastModified": 1727702862, + "narHash": "sha256-4ai7yRN8b2i43gNTAXfAuOw/uIzGqMLON1IXtIRrwOM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "f31447cd3f8e54674bd1675969e97e6043a309bc", + "rev": "f7eb021d9dfd61f0e0075e483f3579c6f8453bb3", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727296349, - "narHash": "sha256-C3SRU3GMDNII9l16o4+nkybuxaDX4x5TBypwmmUBCo0=", + "lastModified": 1727716680, + "narHash": "sha256-uMVkVHL4r3QmlZ1JM+UoJwxqa46cgHnIfqGzVlw5ca4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe866c653c24adf1520628236d4e70bbb2fdd949", + "rev": "b5b22b42c0d10c7d2463e90a546c394711e3a724", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718835956, - "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "lastModified": 1725826545, + "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", "type": "github" }, "original": { @@ -294,11 +294,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1727514110, + "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8", "type": "github" }, "original": { @@ -315,22 +315,21 @@ "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" }, "locked": { - "lastModified": 1722091021, - "narHash": "sha256-XwBhi3XVa3DfdwW84wm7UY6hhg1OE2dijdHQQGsK2u4=", + "lastModified": 1726837731, + "narHash": "sha256-+yZWOHSCwrdSiDviF40o0vb8D+9QfUhcVKWTAskV0Kk=", "owner": "nix-community", "repo": "raspberry-pi-nix", - "rev": "be1defc74eb0aa8b07dc7f15da6f67d7b084c310", + "rev": "d342e97d257f946c16bf6b610cf58d95555be8e7", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.0", "repo": "raspberry-pi-nix", "type": "github" } @@ -369,11 +368,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": { @@ -386,28 +385,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": { @@ -417,19 +416,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" } @@ -437,16 +436,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" } @@ -459,11 +458,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1726524647, - "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", + "lastModified": 1727734513, + "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", + "rev": "3198a242e547939c5e659353551b0668ec150268", "type": "github" }, "original": { @@ -505,14 +504,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" } }, "utils": { diff --git a/flake.nix b/flake.nix index 392c2fe..cf6e314 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix/v0.4.0"; + raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix"; flake-utils.url = "github:numtide/flake-utils"; deploy-rs = { diff --git a/nix/hosts/aristotle/configuration.nix b/nix/hosts/aristotle/configuration.nix index 24707c5..4a59f57 100644 --- a/nix/hosts/aristotle/configuration.nix +++ b/nix/hosts/aristotle/configuration.nix @@ -10,6 +10,9 @@ ../../modules/sops ]; + # See: https://github.com/NixOS/nixos-hardware/issues/858 + boot.initrd.systemd.tpm2.enable = false; + raspberry-pi-nix.board = "bcm2711"; hardware.raspberry-pi.config = { all = {