From fd70759fa07e3bd54822aa421aec816d27442187 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Thu, 25 Jan 2024 16:12:52 +1100 Subject: [PATCH] Update homebrew taps --- darwin/home-manager.nix | 7 ++++ flake.lock | 79 ++++++++++++++++------------------------- flake.nix | 7 +--- 3 files changed, 39 insertions(+), 54 deletions(-) diff --git a/darwin/home-manager.nix b/darwin/home-manager.nix index 6a11858..aef7b90 100644 --- a/darwin/home-manager.nix +++ b/darwin/home-manager.nix @@ -24,6 +24,13 @@ in brews = [ "scip" ]; + # WARNING: should match flake.nix + taps = [ + "homebrew/homebrew-core" + "homebrew/homebrew-cask" + "homebrew/homebrew-cask-fonts" + "homebrew/homebrew-bundle" + ]; }; # These app IDs are from using the mas CLI app diff --git a/flake.lock b/flake.lock index f91daea..194ae74 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1694443293, - "narHash": "sha256-wBjbF2RRFyD4lN7ie98VnggmNBwAPv/dg2U+w5mUyuM=", + "lastModified": 1705326576, + "narHash": "sha256-9PvMgHgdbpb5vBO8fHCRufodR731ynzGMF9+68vKWck=", "owner": "Homebrew", "repo": "brew", - "rev": "4afb8e5602f3ecc9edf67a44257d8eceeaa8a108", + "rev": "1c612baa096c69f2fcb221c74e6f5b9979efdcee", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.1.11", + "ref": "4.2.4", "repo": "brew", "type": "github" } @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1703990467, - "narHash": "sha256-LItEeQVwDfLnavNskwdfRnonbEdq8DYiJlWRtF+bwng=", + "lastModified": 1705915768, + "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "1a41453cba42a3a1af2fff003be455ddbd75386c", + "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1704100519, - "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", + "lastModified": 1706134977, + "narHash": "sha256-KwNb1Li3K6vuVwZ77tFjZ89AWBo7AiCs9t0Cens4BsM=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e91c5df192395753d8e6d55a0352109cb559790", + "rev": "6359d40f6ec0b72a38e02b333f343c3d4929ec10", "type": "github" }, "original": { @@ -77,11 +77,11 @@ "homebrew-bundle": { "flake": false, "locked": { - "lastModified": 1702986543, - "narHash": "sha256-Ybb5fpDXY3aCTtUyDGHRrmb0kwMiPeSr+oGJzt9Eji0=", + "lastModified": 1705667118, + "narHash": "sha256-wijKBOVy8/oXDyRl/tg6YFqzIxfHSOPEHh42EmiK/X4=", "owner": "homebrew", "repo": "homebrew-bundle", - "rev": "e4798d8075e1a793f065be3e5e1674ec09193d17", + "rev": "d44243fe191e962fce60cbf8e25b6f2e3c1248b3", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1704154437, - "narHash": "sha256-h6k9zJBrZgttWzbF6ppFL8ad1gka62MU5BRjTKihKRI=", + "lastModified": 1706154700, + "narHash": "sha256-/MXbzat0hb9qOsQ5xoI9q3VEVyVld5TEVsKgD6kn61s=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "71121116defe7fc74389f85729b56ac5d2ed344c", + "rev": "d1179af95bfc990907088ebb273820389e405c09", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "homebrew-cask-fonts": { "flake": false, "locked": { - "lastModified": 1704003358, - "narHash": "sha256-gu7uOQQf3ISHB1RmaRu9i9ob05TYWss3h+7mPUuqCu8=", + "lastModified": 1706148343, + "narHash": "sha256-L4Su4uq7RpYGJfk5C9opCDPblzsziAqY8jYoewof+cM=", "owner": "homebrew", "repo": "homebrew-cask-fonts", - "rev": "8524380dd27bf99f1ae85b079043ec33227cc93d", + "rev": "9cfef62b9aa4d467d265a253149252a17f11ecdd", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1704152394, - "narHash": "sha256-fMEWOMNPaViZlA3rE52qfDR1+t4cWAgL7QPlIg8eAFE=", + "lastModified": 1706154731, + "narHash": "sha256-clHGxfOVbtgXDoXiDYO8uzvuMMp88UVLiHO+ZQDM24A=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "042c7524bda45cb7363c816286928ab030b85df3", + "rev": "0f18eb80197d2b7f0cd352163cbc46d3e0d5b2f8", "type": "github" }, "original": { @@ -138,22 +138,6 @@ "type": "github" } }, - "homebrew-koekeishiya": { - "flake": false, - "locked": { - "lastModified": 1703360664, - "narHash": "sha256-YJom/MrED61sOPJOw4uk7gZN08HCbdtTHdl6hfcCfIk=", - "owner": "koekeishiya", - "repo": "homebrew-formulae", - "rev": "3f1f36449166cb83f93a6cd8f6e723a6a7350a94", - "type": "github" - }, - "original": { - "owner": "koekeishiya", - "repo": "homebrew-formulae", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -180,11 +164,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1695057498, - "narHash": "sha256-wn3j7u5tOgLLbNxZC542rJiP5iX323m+CoGPMgPOxp4=", + "lastModified": 1705952034, + "narHash": "sha256-H0nk8Gk8kPw4yi2WwOTsSHgPrzSwyNgWEYHk10IJwfc=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "6ab33c5e9249e74401144a7c667d96a757c5d341", + "rev": "40f5ee46b58e7c5f1927e2c5a583dc3d7e571ed9", "type": "github" }, "original": { @@ -195,11 +179,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1705677747, + "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "type": "github" }, "original": { @@ -240,11 +224,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -262,7 +246,6 @@ "homebrew-cask": "homebrew-cask", "homebrew-cask-fonts": "homebrew-cask-fonts", "homebrew-core": "homebrew-core", - "homebrew-koekeishiya": "homebrew-koekeishiya", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs_4" } diff --git a/flake.nix b/flake.nix index 0fc7d8f..e8013d0 100644 --- a/flake.nix +++ b/flake.nix @@ -27,10 +27,6 @@ url = "github:homebrew/homebrew-core"; flake = false; }; - homebrew-koekeishiya = { - url = "github:koekeishiya/homebrew-formulae"; - flake = false; - }; }; outputs = { self @@ -40,7 +36,6 @@ , homebrew-cask , homebrew-cask-fonts , homebrew-core - , homebrew-koekeishiya , nix-homebrew , nixpkgs } @inputs: @@ -76,12 +71,12 @@ nix-homebrew = { enable = true; user = "${user}"; + # WARNING: should match darwin/home-manager.nix taps = { "homebrew/homebrew-core" = homebrew-core; "homebrew/homebrew-cask" = homebrew-cask; "homebrew/homebrew-cask-fonts" = homebrew-cask-fonts; "homebrew/homebrew-bundle" = homebrew-bundle; - "koekeishiya/homebrew-formulae" = homebrew-koekeishiya; }; mutableTaps = false; autoMigrate = true;