From 62f5e27dea8b596865bf7319075b5791d3929cdc Mon Sep 17 00:00:00 2001 From: TheK0tYaRa Date: Wed, 18 Mar 2026 21:42:19 +0200 Subject: [PATCH] sccache didn't fuck anything up, finally --- flake.lock | 24 ++++++++++++------------ todo.md | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index ede1a9d..60ec9c0 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773504138, - "narHash": "sha256-CQZelDz8KtJBcY88cP9KKpqD5WNYkkwOR2U7RhW53T8=", + "lastModified": 1773711063, + "narHash": "sha256-cLdaclWQ1ValFyHUuTUoTbuglryGNvSecVnLJ3GVrng=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "57fec627abf180c338ebdf1b0c5230b59e536ce0", + "rev": "66126ac5b750446573376638ce5361bc97b9aa81", "type": "github" }, "original": { @@ -611,11 +611,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773675540, - "narHash": "sha256-P4S7I15rxuJ+Iq7F4Z1OrMAcZaJEiIasYNioiJjc4/s=", + "lastModified": 1773725889, + "narHash": "sha256-htkVJrtaWJS7wQSXg8d26RR6jF3Iab2bYTNfvTgv05Q=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9061fa226d41fceec5bcec72e0e7ee2282b5645e", + "rev": "9987baf8f935a1b3b2aa89a44c13b3239ecc640e", "type": "github" }, "original": { @@ -695,11 +695,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773231277, - "narHash": "sha256-Xy3WEpUAbpsz8ydgvVAQAGGB/WB+8cNA5cshiL0McTI=", + "lastModified": 1773597492, + "narHash": "sha256-hQ284SkIeNaeyud+LS0WVLX+WL2rxcVZLFEaK0e03zg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75690239f08f885ca9b0267580101f60d10fbe62", + "rev": "a07d4ce6bee67d7c838a8a5796e75dff9caa21ef", "type": "github" }, "original": { @@ -726,11 +726,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1773610124, - "narHash": "sha256-EpC7ELOKmb+xXaqpK5ZRpJ5g9fxxg6tWny7/rUBfrwk=", + "lastModified": 1773705440, + "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9fe1300f4360e13f39d6d1d006e54fd5093e9ad5", + "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3", "type": "github" }, "original": { diff --git a/todo.md b/todo.md index 8ecde24..4dd939b 100644 --- a/todo.md +++ b/todo.md @@ -24,6 +24,7 @@ - The exact problematic arguments were confirmed with a direct `sccache clang ...` probe using the wrapper-emitted argv. - The new ccache-style `sccacheWrapper` / `sccacheStdenv` path evaluates successfully. - `intel-sycl.stdenv.cc` now also evaluates successfully with the ccache-style `sccache.links` replacement in place. +- The custom kernel helper now normalizes config-only `kernelPatches` entries to `{ patch = null; ... }` before calling `buildLinux`, which fixes `devenv shell -- build` failing during kernel evaluation. ## Next Checks @@ -33,6 +34,5 @@ - For CMake packages, the practical fallback is to export `SCCACHE_WRAPPED_COMPILER_PASSTHROUGH=1` for the whole `configurePhase` and unset it in `postConfigure`; caching matters in `buildPhase`, not in compiler-ID probes. - Apply the shared CMake helper to stalled subpackages too, not just top-level wrappers. `oneapi-math-sycl-blas` is one such case. - The same helper may also be needed on the outer package if the subpackage is fixed but the wrapper package then stalls at its own CMake configure. -- Build the patched `sccache` package. - Run a minimal hello-world derivation with the new `sccacheStdenv` and confirm repeated compiles produce cache hits. - If that works, switch current consumers to the ccache-style path and remove obsolete wrapper-patching logic.