drop debug changes, pin sccache on x64 linux

aduh95 · Sep 22, 2026 · Sep 21, 2026 · Sep 20, 2026 · Sep 20, 2026 · Sep 20, 2026
commit 3d1d840b350bf9338ca570ade45954e95eb0c5de
diff --git a/.github/workflows/build-shared.yml b/.github/workflows/build-shared.yml
@@ -92,5 +92,5 @@ jobs:
             --arg pkcs11 ${{ inputs.pkcs11-store-test }} \
             ${{ inputs.extra-nix-flags }} \
             --run '
-                SCCACHE_LOG=debug SCCACHE_NO_DAEMON=1 make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
+                make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
             ' "$TAR_DIR/shell.nix"
diff --git a/.github/workflows/test-shared.yml b/.github/workflows/test-shared.yml
@@ -156,10 +156,10 @@ jobs:
           # built separately in build-aarch64-linux-v8
           # - runner: ubuntu-24.04-arm
           #   system: aarch64-linux
-          # - runner: macos-15-intel
-          #   system: x86_64-darwin
-          # - runner: macos-latest
-          #   system: aarch64-darwin
+          - runner: macos-15-intel
+            system: x86_64-darwin
+          - runner: macos-latest
+            system: aarch64-darwin
     name: '${{ matrix.system }}: with shared libraries${{ matrix.perfetto && '' and perfetto'' || '''' }}'
     uses: $/.github/workflows/build-shared.yml
     with:
@@ -173,7 +173,6 @@ jobs:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
   build-aarch64-linux-v8:
-    if: false
     needs: build-tarball
     runs-on: ubuntu-24.04-arm
     name: 'aarch64-linux: Cache V8 build'

diff --git a/shell.nix b/shell.nix
@@ -121,7 +121,6 @@ pkgs.mkShell {
   '';
 
   env = {
-    RUST_BACKTRACE = "full";
     BUILD_WITH = if (ninja != null) then "ninja" else "make";
     NINJA = pkgs.lib.optionalString (ninja != null) "${pkgs.lib.getExe ninja}";
     CONFIG_FLAGS = builtins.toString (

diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix
@@ -10,4 +10,15 @@ in
 # Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel
 # to keep testing on that platform for a little longer.
 # TODO: remove this when 26.05 is EOL (end of 2026)
-if builtins.currentSystem == "x86_64-darwin" then (import ./pkgs-26.05.nix arg) else nixpkgs
+if builtins.currentSystem == "x86_64-darwin" then
+  (import ./pkgs-26.05.nix arg)
+else
+  nixpkgs
+  //
+    nixpkgs.lib.optionalAttrs (pkgs.stdenv.hostPlatform.isLinux && pkgs.stdenv.hostPlatform.isx86_64)
+      {
+        sccache = nixpkgs.callPackage (builtins.fetchurl {
+          url = "${repo}/raw/aff8a0b28396750446e5537a96461bc4facdb287/pkgs/by-name/sc/sccache/package.nix";
+          sha256 = "09dlc99sam9ld9jvzgcc00r4v4ls1cmbb0yim3mr895fpbs8b3qa";
+        }) { };
+      }