From 9ec1df79f3dc99c0430bf87af7d70bbcaf6ee7c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 22 Jul 2026 07:42:03 +0000 Subject: [PATCH 1/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'attic': 'github:zhaofengli/attic/3d5abb7153f6bbaee4d95af7b6b1e8a0cc400906?narHash=sha256-bP40Va8k28byE5Fm3z%2BwPpSjT3v5a4gZpnDAfLCfrE8%3D' (2026-06-25) → 'github:zhaofengli/attic/7a19204df10d606c5070e6bb72615c3461900c05?narHash=sha256-AyXLhsc2drC%2Blunm%2BTB6Xs6XMMJ/m4B1YjMM1N8JXhU%3D' (2026-07-06) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb?narHash=sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4%3D' (2026-05-13) → 'github:hercules-ci/flake-parts/17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e?narHash=sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w%2B6NWK9yA%3D' (2026-07-01) • Updated input 'git-hooks-nix': 'github:cachix/git-hooks.nix/3bbec39bc90eadfa031e6f3b77272f3f60803e39?narHash=sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco%2B3u0%3D' (2026-06-17) → 'github:cachix/git-hooks.nix/43b3c1ab9d40fb1dbb008f451988a91e375825e9?narHash=sha256-ReRHaLgr/uVqdD8afFSn%2BmyXIfpHeOhP0yYe0TJqAA8%3D' (2026-07-17) • Removed input 'git-hooks-nix/gitignore' • Removed input 'git-hooks-nix/gitignore/nixpkgs' • Updated input 'golink': 'github:tailscale/golink/50d56257a80c781c9cda581b284ffd2bd1847ec4?narHash=sha256-trvhW%2BZ3uRS4YLV5r9Wd2MTcyFHvSsgSRF1xV6nB1kc%3D' (2026-06-12) → 'github:tailscale/golink/c4eca52fa35697a40a311cb6fa3b9b1c9b69705e?narHash=sha256-k4m6fkFD6s2fA4wYCKyEbK0%2BQAeCWbwj%2BFgBMbwGxW8%3D' (2026-07-21) • Updated input 'home-manager': 'github:nix-community/home-manager/3a70e333f2950c302e875c44cfcfaff3f80f36bc?narHash=sha256-vCcLh9pw3XO/%2BLxk8r6xv6QnoCrTfGqiACcI7O637Wg%3D' (2026-06-25) → 'github:nix-community/home-manager/6d8d61567802997f9ec3086b2a837e3ef31fac16?narHash=sha256-t86pRs7IPs3RTMPueWvvdcxyTFrctHAv2Jl7jnjsSf8%3D' (2026-07-22) • Updated input 'homebrew-cask': 'github:homebrew/homebrew-cask/c7201d0d820f7ede5c122d4fde3e91c71c155fba?narHash=sha256-t6IDo6uT8qPiX0SptkUcyMKKlPkcqaDw6sSk8NzSjs4%3D' (2026-06-25) → 'github:homebrew/homebrew-cask/8d2d5a15f538c047d51b36055b14d53db8ef3cf4?narHash=sha256-7C%2B7gDApeb7JG4VXI7v0ZqiYnBRJhbqbY1Y2OI6cPxk%3D' (2026-07-22) • Updated input 'homebrew-core': 'github:homebrew/homebrew-core/6098ff9ebca16b8a9cfd04289a14a97b8b48a092?narHash=sha256-Y2jIrL0i7IaiNzfHbX7Bhz4ZEpjtPMhAjluMK2rkY0c%3D' (2026-06-25) → 'github:homebrew/homebrew-core/6ae532c820ba2691464b92eb3e27f79f676c69b0?narHash=sha256-opJtiqzzMqguYiEiTmV5dI15jeEX8h5YXLA4QbhI9nQ%3D' (2026-07-22) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/a1fa429e945becaf60468600daf649be4ba0350c?narHash=sha256-rCPytmKNjctLloB6UgK5CRrHSwV4b0ygxtJLPPp8R14%3D' (2026-06-18) → 'github:LnL7/nix-darwin/57a3171f94705599a2499248ca5758d5eb47c0e0?narHash=sha256-UvORnAxTRHax7RG74W8Z2t4GvIkX6AjJ5kk0QlwZomo%3D' (2026-07-19) • Updated input 'nix-homebrew': 'github:zhaofengli/nix-homebrew/de7953a08ed4bb9245be043e468561c17b89130d?narHash=sha256-ORqLAo/hoJdsZC7UPAuEHev6S0%2BXIqKEC7vjo5prz1k%3D' (2026-06-13) → 'github:zhaofengli/nix-homebrew/842eeb863ecca0eeb463f7a814cdc51e1d925776?narHash=sha256-I/B6YoRLImHEqNWh8bs%2BtPjEDeteACeFhcLyoSMo1GE%3D' (2026-07-15) • Updated input 'nix-homebrew/brew-src': 'github:Homebrew/brew/109191be4988470b51a60a5ef1998520aa24c01b?narHash=sha256-w4ZTuOnhYiDxjaynrMTASzp802QblBWmo3wpB8wVN4Y%3D' (2026-06-12) → 'github:Homebrew/brew/6bd951d96e7ebc54787799dba77bfb26ec956c4c?narHash=sha256-7KnV7rTlMpys%2B2J%2BTFVxUDDyKPLXFs4wIMtckMC72VM%3D' (2026-07-14) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/3017088b49efd404f78e3b104f553b97e4af786b?narHash=sha256-h4WpMr455AfRub0FXBaon6Vcpe0waUyJ4GivIW6oyd4%3D' (2026-06-21) → 'github:nix-community/nix-index-database/4f8d52a3598b0dc7db7a5e7b419e3edd9d1ecfdb?narHash=sha256-Q5kNLlWngt7TaIIZoxDKWMHjiSaNRVqr70FqWCRRfr4%3D' (2026-07-19) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/875776f0252fcb8618bb948640a0d1f7a5b362be?narHash=sha256-/EtnQBcKbsaCAGQ5VRcplrHRkR4ryqyLMpBfkVuG9Xw%3D' (2026-06-22) → 'github:NixOS/nixos-hardware/779c32a00155994c86cde8213a8dd4df139d4355?narHash=sha256-rkSPTePrKqs4dg%2Bi7ZFCq93%2BHrClac6oSwXX927SVjA%3D' (2026-07-17) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/567a49d1913ce81ac6e9582e3553dd90a955875f?narHash=sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H%2BCNW1Ck8B%2B8%3D' (2026-06-16) → 'github:NixOS/nixpkgs/241313f4e8e508cb9b13278c2b0fa25b9ca27163?narHash=sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU%3D' (2026-07-19) • Updated input 'systems': 'path:./flake.systems.nix' → 'path:./flake.systems.nix' --- flake.lock | 102 +++++++++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 62 deletions(-) diff --git a/flake.lock b/flake.lock index 75dd7d2b..adc2568f 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1782346752, - "narHash": "sha256-bP40Va8k28byE5Fm3z+wPpSjT3v5a4gZpnDAfLCfrE8=", + "lastModified": 1783346450, + "narHash": "sha256-AyXLhsc2drC+lunm+TB6Xs6XMMJ/m4B1YjMM1N8JXhU=", "owner": "zhaofengli", "repo": "attic", - "rev": "3d5abb7153f6bbaee4d95af7b6b1e8a0cc400906", + "rev": "7a19204df10d606c5070e6bb72615c3461900c05", "type": "github" }, "original": { @@ -73,16 +73,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1781226006, - "narHash": "sha256-w4ZTuOnhYiDxjaynrMTASzp802QblBWmo3wpB8wVN4Y=", + "lastModified": 1784068757, + "narHash": "sha256-7KnV7rTlMpys+2J+TFVxUDDyKPLXFs4wIMtckMC72VM=", "owner": "Homebrew", "repo": "brew", - "rev": "109191be4988470b51a60a5ef1998520aa24c01b", + "rev": "6bd951d96e7ebc54787799dba77bfb26ec956c4c", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "6.0.1", + "ref": "6.0.11", "repo": "brew", "type": "github" } @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -236,17 +236,16 @@ "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat_3", - "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1781733627, - "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", "type": "github" }, "original": { @@ -255,27 +254,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "git-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "golink": { "inputs": { "nixpkgs": [ @@ -286,11 +264,11 @@ ] }, "locked": { - "lastModified": 1781286750, - "narHash": "sha256-trvhW+Z3uRS4YLV5r9Wd2MTcyFHvSsgSRF1xV6nB1kc=", + "lastModified": 1784647543, + "narHash": "sha256-k4m6fkFD6s2fA4wYCKyEbK0+QAeCWbwj+FgBMbwGxW8=", "owner": "tailscale", "repo": "golink", - "rev": "50d56257a80c781c9cda581b284ffd2bd1847ec4", + "rev": "c4eca52fa35697a40a311cb6fa3b9b1c9b69705e", "type": "github" }, "original": { @@ -306,11 +284,11 @@ ] }, "locked": { - "lastModified": 1782358560, - "narHash": "sha256-vCcLh9pw3XO/+Lxk8r6xv6QnoCrTfGqiACcI7O637Wg=", + "lastModified": 1784690067, + "narHash": "sha256-t86pRs7IPs3RTMPueWvvdcxyTFrctHAv2Jl7jnjsSf8=", "owner": "nix-community", "repo": "home-manager", - "rev": "3a70e333f2950c302e875c44cfcfaff3f80f36bc", + "rev": "6d8d61567802997f9ec3086b2a837e3ef31fac16", "type": "github" }, "original": { @@ -322,11 +300,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1782373683, - "narHash": "sha256-t6IDo6uT8qPiX0SptkUcyMKKlPkcqaDw6sSk8NzSjs4=", + "lastModified": 1784703249, + "narHash": "sha256-7C+7gDApeb7JG4VXI7v0ZqiYnBRJhbqbY1Y2OI6cPxk=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "c7201d0d820f7ede5c122d4fde3e91c71c155fba", + "rev": "8d2d5a15f538c047d51b36055b14d53db8ef3cf4", "type": "github" }, "original": { @@ -338,11 +316,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1782374936, - "narHash": "sha256-Y2jIrL0i7IaiNzfHbX7Bhz4ZEpjtPMhAjluMK2rkY0c=", + "lastModified": 1784703172, + "narHash": "sha256-opJtiqzzMqguYiEiTmV5dI15jeEX8h5YXLA4QbhI9nQ=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "6098ff9ebca16b8a9cfd04289a14a97b8b48a092", + "rev": "6ae532c820ba2691464b92eb3e27f79f676c69b0", "type": "github" }, "original": { @@ -374,11 +352,11 @@ ] }, "locked": { - "lastModified": 1781761792, - "narHash": "sha256-rCPytmKNjctLloB6UgK5CRrHSwV4b0ygxtJLPPp8R14=", + "lastModified": 1784500460, + "narHash": "sha256-UvORnAxTRHax7RG74W8Z2t4GvIkX6AjJ5kk0QlwZomo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a1fa429e945becaf60468600daf649be4ba0350c", + "rev": "57a3171f94705599a2499248ca5758d5eb47c0e0", "type": "github" }, "original": { @@ -413,11 +391,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1781389246, - "narHash": "sha256-ORqLAo/hoJdsZC7UPAuEHev6S0+XIqKEC7vjo5prz1k=", + "lastModified": 1784159664, + "narHash": "sha256-I/B6YoRLImHEqNWh8bs+tPjEDeteACeFhcLyoSMo1GE=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "de7953a08ed4bb9245be043e468561c17b89130d", + "rev": "842eeb863ecca0eeb463f7a814cdc51e1d925776", "type": "github" }, "original": { @@ -433,11 +411,11 @@ ] }, "locked": { - "lastModified": 1782030356, - "narHash": "sha256-h4WpMr455AfRub0FXBaon6Vcpe0waUyJ4GivIW6oyd4=", + "lastModified": 1784440659, + "narHash": "sha256-Q5kNLlWngt7TaIIZoxDKWMHjiSaNRVqr70FqWCRRfr4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "3017088b49efd404f78e3b104f553b97e4af786b", + "rev": "4f8d52a3598b0dc7db7a5e7b419e3edd9d1ecfdb", "type": "github" }, "original": { @@ -451,11 +429,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1782166108, - "narHash": "sha256-/EtnQBcKbsaCAGQ5VRcplrHRkR4ryqyLMpBfkVuG9Xw=", + "lastModified": 1784310968, + "narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "875776f0252fcb8618bb948640a0d1f7a5b362be", + "rev": "779c32a00155994c86cde8213a8dd4df139d4355", "type": "github" }, "original": { @@ -511,11 +489,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1784497964, + "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", "type": "github" }, "original": { From 8a6e693f43307a099d1808eaf023bf22aab62886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= Date: Mon, 20 Jul 2026 22:10:48 -0700 Subject: [PATCH 2/6] fix: allow graphite-cli-unwrapped unfree package, surface CI eval errors The graphite-cli wrapper builds an inner graphite-cli-unwrapped derivation that carries the actual unfree license, so it needed its own allowlist entry in both the NixOS module and flake devShell predicates. Also fix the CI eval script swallowing real error output: set -e was aborting on the failing `stderr=$(...)` assignment before the subsequent echo could run. --- .github/workflows/ci.yml | 4 +++- flake.nix | 1 + modules/base/unfree-packages.nix | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44bd495c..dee42338 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,9 @@ jobs: eval_host() { local host="$1" local expr="$2" + local rc=0 echo "Evaluating $host..." - stderr=$(nix eval "$expr" 2>&1 >/dev/null) + stderr=$(nix eval "$expr" 2>&1 >/dev/null) || rc=$? if [ -n "$stderr" ]; then echo "$stderr" if echo "$stderr" | grep -q "evaluation warning:"; then @@ -27,6 +28,7 @@ jobs: echo "::warning title=Evaluation warnings ($host)::${encoded}" fi fi + return $rc } for host in glyph spore zeta; do eval_host "$host" ".#nixosConfigurations.$host.config.system.build.toplevel.drvPath" diff --git a/flake.nix b/flake.nix index 484e4390..013167a6 100644 --- a/flake.nix +++ b/flake.nix @@ -202,6 +202,7 @@ config.allowUnfreePredicate = pkg: builtins.elem (inputs.nixpkgs.lib.getName pkg) [ "graphite-cli" + "graphite-cli-unwrapped" "obsidian-headless" ]; }; diff --git a/modules/base/unfree-packages.nix b/modules/base/unfree-packages.nix index 85c80b61..d4b34a2d 100644 --- a/modules/base/unfree-packages.nix +++ b/modules/base/unfree-packages.nix @@ -11,6 +11,7 @@ "daisydisk" "fastscripts" "graphite-cli" + "graphite-cli-unwrapped" "mochi" "obsidian-headless" "open-webui" From c36b8933310e30dac10626ee0a3668ad5628f9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= Date: Wed, 22 Jul 2026 10:06:19 -0700 Subject: [PATCH 3/6] fix(Rhizome): update daisydisk to 4.34.2, fix hash mismatch Vendor shipped a new build at the same download URL, so the pinned fixed-output hash no longer matched what daisydiskapp.com now serves. Entire-Checkpoint: dd5b9a86022a --- overlays/daisydisk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/daisydisk.nix b/overlays/daisydisk.nix index fd335e20..9f418e4d 100644 --- a/overlays/daisydisk.nix +++ b/overlays/daisydisk.nix @@ -1,9 +1,9 @@ self: super: { daisydisk = super.daisydisk.overrideAttrs (old: { - version = "4.32"; + version = "4.34.2"; src = super.fetchzip { url = "https://daisydiskapp.com/download/DaisyDisk.zip"; - hash = "sha256-2QhaY4oQV+bkvcyC88Zsk7eZJ6dySsb5G2+juH8HNjI="; + hash = "sha256-lSV367twsKDp0e5TsVYfjYO5GPcjtteBCxmUIOrz+0E="; stripRoot = false; }; }); From b76724233fae4295a608db48ddfc4b917bd09d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= Date: Wed, 22 Jul 2026 14:21:48 -0700 Subject: [PATCH 4/6] fix: unpin attic's nixpkgs from our fast-moving pin attic's nixpkgs.follows tied attic-client's (crane/Rust) build to our nixpkgs input, which the nightly flake-update bumps daily. That made the derivation hash change every day, so CI's "Configure Attic cache" step could never hit a binary substitute and had to rebuild the whole Rust dependency tree from scratch on every run. Letting attic use its own locked nixpkgs decouples its build from our bumps. Entire-Checkpoint: 23090f88d617 --- flake.lock | 38 ++++++++++++++++++++++++++------------ flake.nix | 1 - 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index adc2568f..84dd457a 100644 --- a/flake.lock +++ b/flake.lock @@ -51,9 +51,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -426,7 +424,7 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1784310968, @@ -444,15 +442,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + "lastModified": 1784555310, + "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { @@ -488,6 +489,19 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1784497964, "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", @@ -520,7 +534,7 @@ "nix-homebrew": "nix-homebrew", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable-24-05": "nixpkgs-stable-24-05", "systems": "systems_2", "zx-dev": "zx-dev" diff --git a/flake.nix b/flake.nix index 013167a6..df6cc34f 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,6 @@ }; attic = { url = "github:zhaofengli/attic"; - inputs.nixpkgs.follows = "nixpkgs"; }; zx-dev = { url = "github:stackptr/zx.dev"; From d9be1d4a4cf0952bf8fbf1a685875d38750ae0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= Date: Wed, 22 Jul 2026 14:55:46 -0700 Subject: [PATCH 5/6] fix(zeta): disable paho-mqtt's flaky test suite Its checkPhase intermittently fails on client/broker teardown timing under CI, with a different test failing each run rather than a consistent regression, which was blocking every zeta build. Tracked upstream, unresolved as of writing: https://github.com/NixOS/nixpkgs/issues/542586 Entire-Checkpoint: 27ee6788e1cb --- overlays/default.nix | 3 +++ overlays/paho-mqtt.nix | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 overlays/paho-mqtt.nix diff --git a/overlays/default.nix b/overlays/default.nix index 45dcf619..e53ad97a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,4 +8,7 @@ # Override opencode ahead of nixpkgs pin (import ./opencode.nix) + + # Skip paho-mqtt's flaky test suite (nixpkgs#542586) + (import ./paho-mqtt.nix) ] diff --git a/overlays/paho-mqtt.nix b/overlays/paho-mqtt.nix new file mode 100644 index 00000000..fd04755e --- /dev/null +++ b/overlays/paho-mqtt.nix @@ -0,0 +1,15 @@ +# paho-mqtt's test suite is flaky on client/broker teardown timing and +# intermittently fails CI (different tests fail each run, not a real +# regression). Tracked upstream, unresolved as of writing: +# https://github.com/NixOS/nixpkgs/issues/542586 +final: prev: { + pythonPackagesExtensions = + prev.pythonPackagesExtensions + ++ [ + (pyFinal: pyPrev: { + paho-mqtt = pyPrev.paho-mqtt.overrideAttrs (old: { + doCheck = false; + }); + }) + ]; +} From 527d3da464d91337b5997006d7229f86f666843c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= Date: Wed, 22 Jul 2026 15:44:28 -0700 Subject: [PATCH 6/6] fix(zeta): actually disable paho-mqtt's tests via doInstallCheck The previous fix set doCheck = false, but paho-mqtt uses nixpkgs' pyproject-style builder, which runs its checks in installCheckPhase (gated by doInstallCheck) rather than the traditional checkPhase. doCheck alone was a no-op: same drv hash, pytest-check-hook still present, tests still ran and still failed CI. Confirmed via `nix derivation show` that doInstallCheck = false actually drops pytest-check-hook and changes the output hash. Entire-Checkpoint: 1dba023f3de5 --- overlays/paho-mqtt.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overlays/paho-mqtt.nix b/overlays/paho-mqtt.nix index fd04755e..3d6ec9bb 100644 --- a/overlays/paho-mqtt.nix +++ b/overlays/paho-mqtt.nix @@ -7,8 +7,11 @@ final: prev: { prev.pythonPackagesExtensions ++ [ (pyFinal: pyPrev: { + # Its checks run in installCheckPhase (pyproject-style builder), not + # checkPhase, so doCheck alone is a no-op here. paho-mqtt = pyPrev.paho-mqtt.overrideAttrs (old: { doCheck = false; + doInstallCheck = false; }); }) ];