From 7facb8562fcb14da9323212960efae26f3587299 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Mon, 24 Mar 2025 23:14:05 -0400 Subject: [PATCH] Update Flox, update nix-homebrew --- flake.lock | 257 +++++++++++++++++++---------------------------------- flake.nix | 2 +- 2 files changed, 93 insertions(+), 166 deletions(-) diff --git a/flake.lock b/flake.lock index c87bf6a..094716b 100644 --- a/flake.lock +++ b/flake.lock @@ -19,16 +19,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1740943974, - "narHash": "sha256-2lRLfb6qwoUAsX/XtYmt/ETxtGid6/VaBeFiRsoVMtU=", + "lastModified": 1742457334, + "narHash": "sha256-Gn7ruyb3NDFr+SsHBfA2NsJI8YkkWdECqLRj/xcjt+E=", "owner": "Homebrew", "repo": "brew", - "rev": "64efed206deeb9c2304d9e5b5910dcbf0a509c15", + "rev": "f3bd91d3afe086824d24708230e1f0c7f943135a", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.4.23", + "ref": "4.4.25", "repo": "brew", "type": "github" } @@ -72,18 +72,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "flox", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1703439018, - "narHash": "sha256-VT+06ft/x3eMZ1MJxWzQP3zXFGcrxGo5VR2rB7t88hs=", + "lastModified": 1737689766, + "narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=", "owner": "ipetkov", "repo": "crane", - "rev": "afdcd41180e3dfe4dac46b5ee396e3b12ccc967a", + "rev": "6fe74265bbb6d016d663b1091f015e2976c4a527", "type": "github" }, "original": { @@ -121,11 +115,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1713939967, - "narHash": "sha256-3YQSEYvAIHE40tx5nM9dgeEe0gsHjf15+gurUpyDYNw=", + "lastModified": 1738305171, + "narHash": "sha256-Bt7jBEGnOmxyvma4S7MFFf3vbPUiTbr8TJoZLXEDXKc=", "owner": "nix-community", "repo": "fenix", - "rev": "5c3ff469526a6ca54a887fbda9d67aef4dd4a921", + "rev": "667e3751a708b886bb67879147f71c07b0014c7f", "type": "github" }, "original": { @@ -137,11 +131,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -215,45 +209,25 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flox": { "inputs": { "crane": "crane", "fenix": "fenix", "nixpkgs": "nixpkgs", - "nixpkgs-bear": "nixpkgs-bear", - "nixpkgs-process-compose": "nixpkgs-process-compose", "pre-commit-hooks": "pre-commit-hooks", - "sqlite3pp": "sqlite3pp" + "t3-src": "t3-src" }, "locked": { - "lastModified": 1722880304, - "narHash": "sha256-nSAGizlqq2qB/gEWKK8TXfd7WyuTx8oUMya4ssa3CLU=", + "lastModified": 1741025483, + "narHash": "sha256-6jGwruM+389qisKNPgXHLO7RB/DJ8kwExVHyVR0ufPU=", "owner": "flox", "repo": "flox", - "rev": "d13a0d4093ae2eb02af4a4dd2e793536f497fce8", + "rev": "b760d17ef27f6d3c158c02a109b118ba5eb49cc9", "type": "github" }, "original": { "owner": "flox", - "ref": "v1.2.3", + "ref": "v1.3.16", "repo": "flox", "type": "github" } @@ -283,11 +257,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -303,11 +277,11 @@ ] }, "locked": { - "lastModified": 1742234739, - "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { @@ -364,11 +338,11 @@ ] }, "locked": { - "lastModified": 1741032878, - "narHash": "sha256-s9YOBz8vAxPlI4wORma3D7km8wZOEe/7Hg/u3brmwUQ=", + "lastModified": 1742619394, + "narHash": "sha256-8uwIBjbKxeJ7u0VACSNs634HwtgRLxP6/+cIkUXmuyI=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "a82c55b07f670a01da5a72b7a07fe41c256a4380", + "rev": "04b0536479d2d2e8d71dc8c8ee97c2b61f0c9987", "type": "github" }, "original": { @@ -408,14 +382,15 @@ ], "nixpkgs-stable": [ "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1742395601, - "narHash": "sha256-WSoI4R/pY/8AY5ulSn03nry9KFGBGFRFcXjhBYYRYtI=", + "lastModified": 1742863891, + "narHash": "sha256-/mGCIxO7zlWCHOZLaOMRoJgSLpIav0PBKWG3BQddElw=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "7f8e9de5c8494d209bd618dad4ad81e98b19fabc", + "rev": "366999efebcad2165f472ef93e9c996693bda75d", "type": "github" }, "original": { @@ -426,11 +401,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742376361, - "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { @@ -442,16 +417,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704300003, - "narHash": "sha256-FRC/OlLVvKkrdm+RtrODQPufD0vVZYA0hpH9RPaHmp4=", - "owner": "NixOS", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "flox", "repo": "nixpkgs", - "rev": "ab5fd150146dcfe41fda501134e6503932cc8dfd", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "release-23.11", + "owner": "flox", + "ref": "stable", "repo": "nixpkgs", "type": "github" } @@ -472,22 +447,6 @@ "type": "github" } }, - "nixpkgs-bear": { - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1722555339, @@ -500,38 +459,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, - "nixpkgs-process-compose": { - "locked": { - "lastModified": 1722415718, - "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-terraform": { "inputs": { "config": "config", @@ -543,14 +470,14 @@ "nixpkgs-1_9": [ "nixpkgs-unstable" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1742308621, - "narHash": "sha256-7t/lsUjINFFxL1WuqgGbcXO2J1Hd1f/qqAyjzhKhZbI=", + "lastModified": 1742861481, + "narHash": "sha256-pjPGFmy+yDZvgv7NfU7BNG6ktkSXVUu4HuT4xkGWPrY=", "owner": "stackbuilders", "repo": "nixpkgs-terraform", - "rev": "f3552b7e554499fe5471aff491d4bf315fbeb7f5", + "rev": "3674c0b3fc48fca619bc69ddcc8db7f5ed2d66b9", "type": "github" }, "original": { @@ -561,11 +488,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742272065, - "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=", + "lastModified": 1742800061, + "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3549532663732bfd89993204d40543e9edaec4f2", + "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", "type": "github" }, "original": { @@ -577,11 +504,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { @@ -616,20 +543,18 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "flox", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1703939133, - "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -660,11 +585,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713801366, - "narHash": "sha256-VmzP5s59kb6//mj+ES+hslTLuugjd7OluGIXXcwuyHg=", + "lastModified": 1738224931, + "narHash": "sha256-1zhfA5NBqin0Z79Se85juvqQteq7uClJMEb7l2pdDUY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "e31c9f3fe11148514c3ad254b639b2ed7dbe35de", + "rev": "3c2aca1e5e9fbabb4e05fc4baa62e807aadc476a", "type": "github" }, "original": { @@ -674,6 +599,27 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742437918, + "narHash": "sha256-Vflb6KJVDikFcM9E231mRN88uk4+jo7BWtaaQMifthI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f03085549609e49c7bcbbee86a1949057d087199", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", @@ -707,11 +653,11 @@ ] }, "locked": { - "lastModified": 1742406979, - "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", + "lastModified": 1742700801, + "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", "owner": "mic92", "repo": "sops-nix", - "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", + "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", "type": "github" }, "original": { @@ -720,27 +666,6 @@ "type": "github" } }, - "sqlite3pp": { - "inputs": { - "nixpkgs": [ - "flox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1691154329, - "narHash": "sha256-nMtwh/G1/Zt70rl540jn+nFVJuju0NdXJwk2Y3pNB+k=", - "owner": "aakropotkin", - "repo": "sqlite3pp", - "rev": "775e48a6c7a63a51585cd628f6c9816ba634a246", - "type": "github" - }, - "original": { - "owner": "aakropotkin", - "repo": "sqlite3pp", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -756,18 +681,20 @@ "type": "github" } }, - "systems_2": { + "t3-src": { + "flake": false, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1738681975, + "narHash": "sha256-QLaOMYlEYjUZpuXJ/MOKb+UqzrTiOu6Isuqj07HTxkQ=", + "owner": "flox", + "repo": "t3", + "rev": "83caeb1cc47fd07117ee5cf478f82cc177cca598", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "flox", + "ref": "v1.0.7", + "repo": "t3", "type": "github" } } diff --git a/flake.nix b/flake.nix index 6eab8ab..0b3d77d 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ }; flox = { - url = "github:flox/flox/v1.2.3"; + url = "github:flox/flox/v1.3.16"; # their nixpkgs currently follow release-23.11 };