From 187edef30f8cfef7c6758afe6c29f3e47338109e Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 22 May 2026 13:59:59 -0700 Subject: [PATCH] flake: update nix-darwin inputs --- nix-darwin/flake.lock | 62 +++++++++++++++++++++---------------------- nix-darwin/flake.nix | 11 +++++++- 2 files changed, 41 insertions(+), 32 deletions(-) diff --git a/nix-darwin/flake.lock b/nix-darwin/flake.lock index 559c13ba..4e096143 100644 --- a/nix-darwin/flake.lock +++ b/nix-darwin/flake.lock @@ -67,16 +67,16 @@ "brew-src_2": { "flake": false, "locked": { - "lastModified": 1778146321, - "narHash": "sha256-HeBwuJmuBioZHyZqDOcf7W/xsMFupSD583v6I5Cl7a8=", + "lastModified": 1778427648, + "narHash": "sha256-pt9KaDGsMyYWB9JeHs4XGHs870f1lOZe3vx9LpVIhUE=", "owner": "Homebrew", "repo": "brew", - "rev": "af835384ac574f76025adb38b292b04cecee1f1f", + "rev": "6f293daa9f9f5832e13b497976335e90509886d7", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "5.1.10", + "ref": "5.1.11", "repo": "brew", "type": "github" } @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1778621214, - "narHash": "sha256-a01yQHAvpKSEgo22bKBtHOWtDb49U92dIBDV7WVIaEA=", + "lastModified": 1779413820, + "narHash": "sha256-hydmw2JiC3f211MtY0kvm7uIQnMlHiChC7lisDrwKes=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "6c8a73cc749fff4b45ae26d86dbfc82e2093d12c", + "rev": "7275f14fe05a6001e4832084b8332043d0206e39", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1778282716, - "narHash": "sha256-fHo9PlYWu970hmdVkDB2Jqeu0VmhmqQ5iKOnPjf/I1E=", + "lastModified": 1779385571, + "narHash": "sha256-qvJmkFUHLb0lWUHguEpcFh5sBUSSBzkjGimWkh7RMfQ=", "owner": "sadjow", "repo": "codex-cli-nix", - "rev": "7f0f3802287581e04501e2fea26b56d63df18ebd", + "rev": "1b8816f0f793031ee98c928ae7a3bcca2f0b54c0", "type": "github" }, "original": { @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1778628724, - "narHash": "sha256-VNG6hJ146VEenXcDrB3t6MVnrMx+gtyCWTCDkzOp9Qs=", + "lastModified": 1779336838, + "narHash": "sha256-n1+l78hJRABp4cQHKeD0BVByT0vZLPqd09Tvoq8Q+d8=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a0bbd6b4720da1c9ce7ebf35ff5c41a82db367a", + "rev": "928d72376949e222ea4f07b44828a55b0136422e", "type": "github" }, "original": { @@ -415,11 +415,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1778665161, - "narHash": "sha256-iffsbk5uf+xkPJY0DQzfBCTo58lCFxoLSmtFdhKwAuo=", + "lastModified": 1779449622, + "narHash": "sha256-NK3RkEceQ0lCxfo4xm/eGdN56C6jz8QS16EWXtpCVgU=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "41670e2c6ba14d92acf86c22fccc26d9bd972212", + "rev": "3bfff93559a802b14650517b3e8373fb7ca5073c", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1778667551, - "narHash": "sha256-1KftBpiQRi6t2/jn7kiCXWp9Ov4FVD19wrHNvJVmDeI=", + "lastModified": 1779448671, + "narHash": "sha256-CqOLj2e8lD6q39LSe/FH8Yfbosu+LsXzKu/a+VOCpEs=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "ec249d9026c15d9444d27346352ff8b228ad4af9", + "rev": "77c601bc37c03792eb157871b7e4c04837d4deb1", "type": "github" }, "original": { @@ -455,11 +455,11 @@ ] }, "locked": { - "lastModified": 1778406464, - "narHash": "sha256-xCzb78zzv3DJbA5+/NyA8WVUzWwWyHCginbFN7AoIHo=", + "lastModified": 1778829701, + "narHash": "sha256-TzhVjzGRKf41XERk2Fin3OnqDh6b66SbrJ9zljMkdjE=", "owner": "colonelpanic8", "repo": "keepbook", - "rev": "b591f97904a3fe0d89516efbf6f4fee1abc58e8c", + "rev": "994216cb558b60d4567d43f5b0031a6436de92c9", "type": "github" }, "original": { @@ -475,11 +475,11 @@ ] }, "locked": { - "lastModified": 1777780666, - "narHash": "sha256-8wURyQMdDkGUarSTKOGdCuFfYiwa3HbzwscUfn3STDE=", + "lastModified": 1779036909, + "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "8c62fba0854ba15c8917aed18894dbccb48a3777", + "rev": "56c666e108467d87d13508936aade6d567f2a501", "type": "github" }, "original": { @@ -493,11 +493,11 @@ "brew-src": "brew-src_2" }, "locked": { - "lastModified": 1778332591, - "narHash": "sha256-ctJ3ADtugrnbMfMBobA645gCqXVIyHnsCNMkVaIuSiM=", + "lastModified": 1778851564, + "narHash": "sha256-p8wzcnpB2Iys+QzAKM9/Eyw/pUyqCO3sw/NCnDH4dTE=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "7d0038b5bb60568ec41f5f4ef5067cd221ca7c0d", + "rev": "b3a87b4793205cc111f3c61e25e018ffac3b8039", "type": "github" }, "original": { @@ -524,11 +524,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1778580735, - "narHash": "sha256-t+8AVV8ExvOmslz2sLIgw/hJBKlyl65rJvxjvvjHgpE=", + "lastModified": 1779414690, + "narHash": "sha256-gOTcX/9MZVMUE0Xvb4IEcv+0TQJkZFNEnL757ljU360=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48d91f2c0ce7b9e589f967d4f685153dd765dcdd", + "rev": "6dedf69f94d03cbe7bdde106f2d4c23ae2a853bf", "type": "github" }, "original": { diff --git a/nix-darwin/flake.nix b/nix-darwin/flake.nix index b031495a..19e6d183 100644 --- a/nix-darwin/flake.nix +++ b/nix-darwin/flake.nix @@ -284,7 +284,16 @@ (final: prev: { codex = inputs.codex-cli-nix.packages.${prev.stdenv.hostPlatform.system}.default; claude-code = inputs.claude-code-nix.packages.${prev.stdenv.hostPlatform.system}.default; - git-sync-rs = git-sync-rs.packages.${prev.stdenv.hostPlatform.system}.default; + git-sync-rs = git-sync-rs.packages.${prev.stdenv.hostPlatform.system}.default.overrideAttrs (old: { + checkFlags = + (old.checkFlags or []) + ++ [ + # Git can auto-detect the Darwin Nix build user's identity, so this + # test does not exercise git-sync-rs's missing-identity fallback here. + "--skip" + "sync::transport::tests::commit_retries_with_fallback_identity_when_git_identity_missing" + ]; + }); }) ]; environment.systemPackages =