Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
seanaye/chore/update flake (#5160)
Sean Aye9a6ce2f8fd06
diff --git a/flake.lock b/flake.lockindex be08a5f44f..156199515f 100644--- a/flake.lock+++ b/flake.lock@@ -2,11 +2,11 @@"nodes": {"crane": {"locked": {- "lastModified": 1781825982,- "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=",+ "lastModified": 1784564969,+ "narHash": "sha256-TkTWNhJV/8Wk3czlbz4bwHZkFCaCHPsOy+oJe4PUiXg=","owner": "ipetkov","repo": "crane",- "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7",+ "rev": "7930f6c291de6f83c257839d434592aa085f290a","type": "github"},"original": {@@ -38,11 +38,11 @@"rust-analyzer-src": "rust-analyzer-src"},"locked": {- "lastModified": 1782131086,- "narHash": "sha256-M73jIp606F878X6bq/dQ11IRmAwd+/ssdK+7qvr50vo=",+ "lastModified": 1784795840,+ "narHash": "sha256-Z5cDTnG/+k7lNMMyuNH2RDWmSuGw2d3nV9AlVrpGnNE=","owner": "nix-community","repo": "fenix",- "rev": "309fb007facc8caa25c99413502b38fddb3ffdc2",+ "rev": "85164e3aaadbc35cbbb4a9fef6d358b607da09fc","type": "github"},"original": {@@ -56,11 +56,11 @@"nixpkgs-lib": "nixpkgs-lib"},"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": {@@ -89,11 +89,11 @@},"import-tree": {"locked": {- "lastModified": 1778781969,- "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",+ "lastModified": 1784254960,+ "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=","owner": "vic","repo": "import-tree",- "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",+ "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69","type": "github"},"original": {@@ -104,11 +104,11 @@},"nixpkgs": {"locked": {- "lastModified": 1781577229,- "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",+ "lastModified": 1784497964,+ "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=","owner": "NixOS","repo": "nixpkgs",- "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",+ "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163","type": "github"},"original": {@@ -120,11 +120,11 @@},"nixpkgs-lib": {"locked": {- "lastModified": 1777168982,- "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",+ "lastModified": 1782614948,+ "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=","owner": "nix-community","repo": "nixpkgs.lib",- "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",+ "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c","type": "github"},"original": {@@ -147,11 +147,11 @@"rust-analyzer-src": {"flake": false,"locked": {- "lastModified": 1782030001,- "narHash": "sha256-1JBvwtGyIsEBIemJBi6syH7iQ+pct7i+HNa1WSZfozs=",+ "lastModified": 1784667699,+ "narHash": "sha256-853teJQOgTTKRfNxcIJ53ziJOGNeg3c74PvQl5l61Jc=","owner": "rust-lang","repo": "rust-analyzer",- "rev": "69ccffdb5b3570c6c14c5780bf2e8836f2209d90",+ "rev": "1174734d9c6453d13d2b5e3d578512c579ca37f1","type": "github"},"original": {diff --git a/nix-support/node_modules-hashes.json b/nix-support/node_modules-hashes.jsonindex 5e33437d18..a557ea7cb3 100644--- a/nix-support/node_modules-hashes.json+++ b/nix-support/node_modules-hashes.json@@ -1,6 +1,6 @@{"nodeModules": {- "aarch64-darwin": "sha256-cLWPkAkYqrye5JYmgs1lUhTzntvA3lKefsBTQtqFVdk=",+ "aarch64-darwin": "sha256-aBAkpRkHflmOsUxj2mnlfDNvhVQfG4Y06AEMTL0uvpg=","x86_64-linux": "sha256-DCbmGcXs+OGOH+ibJXHOQRkXI4xwqG6EZlXOLNrTSlk="}}diff --git a/nix/cloud-storage.nix b/nix/cloud-storage.nixindex bace6ac1c5..66663663c2 100644--- a/nix/cloud-storage.nix+++ b/nix/cloud-storage.nix@@ -719,7 +719,6 @@sccacherustToolchainpython3- vitejs]++ pkgs.lib.optionals isLinux [ mold ];@@ -822,6 +821,35 @@PKG_CONFIG_PATH_FOR_TARGET = pkgConfigPath;LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache";+ # Local dev shells favor reusable sccache artifacts across JJ+ # workspaces. CI derivations do not inherit devShell attributes.+ CARGO_INCREMENTAL = "0";+ SCCACHE_CACHE_SIZE = "30G";+ # Namespace CI runners preserve Cargo's ignored target directory.+ # A flake update can change the Nix C compiler while leaving CMake+ # configure state behind; CMake then drops its command-line cache+ # entries while switching compilers, breaking aws-lc and librdkafka.+ # Remove only caches configured by another compiler so ordinary+ # shell entry keeps reusable native build state.+ shellHook = pkgs.lib.optionalString isLinux ''+ target_dir="''${CARGO_TARGET_DIR:-target}"+ current_cc="$(type -P "''${CC:-cc}" || true)"+ if [ -n "$current_cc" ] && [ -d "$target_dir" ]; then+ while IFS= read -r -d "" cache; do+ cached_cc=""+ while IFS="=" read -r key value; do+ case "$key" in+ CMAKE_C_COMPILER:*) cached_cc="$value"; break ;;+ esac+ done < "$cache"+ if [ -n "$cached_cc" ] && [ "$cached_cc" != "$current_cc" ]; then+ dir="$(dirname "$cache")"+ echo "purging stale CMake state in $dir ($cached_cc != $current_cc)"+ rm -rf "$dir/CMakeFiles" "$cache"+ fi+ done < <(find "$target_dir" -name CMakeCache.txt -print0)+ fi+ '';# rdkafka's ssl-vendored feature exists for the Lambda# derivations (see lambdaCommonArgs); local builds keep using# the Nix openssl instead of vendoring, which would need perl