walkah/athens
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

🐛 aristotle: fix kernel build

Browse Source
This commit is contained in:
James Walker 2024-10-01 13:34:13 -04:00
parent 5c489491ad
commit d9b0c54edc
Signed by: walkah
SSH Key Fingerprint: SHA256:f7Gn4jO4BFHZxWfKTTzEAfWz+cLW51IyGFl9MjDyZGI
3 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
flake.lock generated
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727003835, "lastModified": 1727707210,
"narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -30,11 +30,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1718194053, "lastModified": 1727447169,
"narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +137,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727370457, "lastModified": 1727383923,
"narHash": "sha256-YlTm2rgsf+UxxNnUCE/B/8bL9A3HOfPZD8l8EjlWm/Y=", "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "57e6b30d181ae6baff0909a61544ecbe1f642936", "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -153,44 +153,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",
"repo": "libcamera", "repo": "libcamera",
"rev": "6ddd79b5bdbedc1f61007aed35391f1559f9e29a", "rev": "69a894c4adad524d3063dd027f5c4774485cf9db",
"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"
} }
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1726966855, "lastModified": 1727571693,
"narHash": "sha256-25ByioeOBFcnitO5lM/Mufnv/u7YtHEHEM8QFuiS40k=", "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "575704ff85d3a41dc5bfef7b55380cbc7b87f3c2", "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,11 +207,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727312535, "lastModified": 1727702862,
"narHash": "sha256-exnTgS6OBYvEa8v5x8UsLQK2ERdDFwXNFQHoT2cqycY=", "narHash": "sha256-4ai7yRN8b2i43gNTAXfAuOw/uIzGqMLON1IXtIRrwOM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "f31447cd3f8e54674bd1675969e97e6043a309bc", "rev": "f7eb021d9dfd61f0e0075e483f3579c6f8453bb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +222,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1727296349, "lastModified": 1727716680,
"narHash": "sha256-C3SRU3GMDNII9l16o4+nkybuxaDX4x5TBypwmmUBCo0=", "narHash": "sha256-uMVkVHL4r3QmlZ1JM+UoJwxqa46cgHnIfqGzVlw5ca4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fe866c653c24adf1520628236d4e70bbb2fdd949", "rev": "b5b22b42c0d10c7d2463e90a546c394711e3a724",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +270,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"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": {
@ -294,11 +294,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1726745158, "lastModified": 1727514110,
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -315,22 +315,21 @@
"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"
}, },
"locked": { "locked": {
"lastModified": 1722091021, "lastModified": 1726837731,
"narHash": "sha256-XwBhi3XVa3DfdwW84wm7UY6hhg1OE2dijdHQQGsK2u4=", "narHash": "sha256-+yZWOHSCwrdSiDviF40o0vb8D+9QfUhcVKWTAskV0Kk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "raspberry-pi-nix", "repo": "raspberry-pi-nix",
"rev": "be1defc74eb0aa8b07dc7f15da6f67d7b084c310", "rev": "d342e97d257f946c16bf6b610cf58d95555be8e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "v0.4.0",
"repo": "raspberry-pi-nix", "repo": "raspberry-pi-nix",
"type": "github" "type": "github"
} }
@ -369,11 +368,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": {
@ -386,28 +385,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": {
@ -417,19 +416,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"
} }
@ -437,16 +436,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"
} }
@ -459,11 +458,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1726524647, "lastModified": 1727734513,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "rev": "3198a242e547939c5e659353551b0668ec150268",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -505,14 +504,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"
} }
}, },
"utils": { "utils": {

2
flake.nix
View File

@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; 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"; flake-utils.url = "github:numtide/flake-utils";
deploy-rs = { deploy-rs = {

3
nix/hosts/aristotle/configuration.nix
View File

@ -10,6 +10,9 @@
../../modules/sops ../../modules/sops
]; ];
# See: https://github.com/NixOS/nixos-hardware/issues/858
boot.initrd.systemd.tpm2.enable = false;
raspberry-pi-nix.board = "bcm2711"; raspberry-pi-nix.board = "bcm2711";
hardware.raspberry-pi.config = { hardware.raspberry-pi.config = {
all = { all = {