diff options
| -rwxr-xr-x | .gitattributes | 5 | ||||
| -rw-r--r-- | flake.lock | 277 |
2 files changed, 189 insertions, 93 deletions
diff --git a/.gitattributes b/.gitattributes index 94f480d..61e26c7 100755 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,4 @@ -* text=auto eol=lf \ No newline at end of file +* text=auto eol=lf + +# We don't want git to display diffs for this file because they're way too long. +flake.lock -diff \ No newline at end of file diff --git a/flake.lock b/flake.lock index c73cd8c..e2c8599 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "lastModified": 1717279440, + "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=", "owner": "zhaofengli", "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "rev": "717cc95983cdc357bc347d70be20ced21f935843", "type": "github" }, "original": { @@ -50,7 +50,7 @@ "inputs": { "crane": "crane_5", "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable_4" }, @@ -98,11 +98,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1717420532, - "narHash": "sha256-OCCmI69EMaA4BcxRKrXJsx5Ozua2f/PKEy4aJbE7ziM=", + "lastModified": 1719923519, + "narHash": "sha256-7Rhljj2fsklFRsu+eq7N683Z9qukmreMEj5C1GqCrSA=", "owner": "cachix", "repo": "cachix", - "rev": "5727f0676f08a4b41ed13d403ec64dcce989f6e5", + "rev": "4e9e71f78b9500fa6210cf1eaa4d75bdbab777c3", "type": "github" }, "original": { @@ -112,14 +112,50 @@ "type": "github" } }, + "cachix_2": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "devenv", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1712055811, + "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "owner": "cachix", + "repo": "cachix", + "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "complement": { "flake": false, "locked": { - "lastModified": 1715700731, - "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", + "lastModified": 1719903368, + "narHash": "sha256-PPzgxM4Bir+Zh9FUV/v+RBxEYeJxYVmi/BYo3uqt268=", "owner": "matrix-org", "repo": "complement", - "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", + "rev": "bc97f1ddc1cd7485faf80c8935ee2641f3e1b57c", "type": "github" }, "original": { @@ -162,18 +198,18 @@ "crane": "crane_4", "fenix": "fenix_2", "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "liburing": "liburing", "nix-filter": "nix-filter_2", "nixpkgs": "nixpkgs_6", "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1719807498, - "narHash": "sha256-8+1zE350sYFvxmvDc0uEQLXXs94FEeF7GAZA2BDlm2Q=", + "lastModified": 1719988456, + "narHash": "sha256-Xqc5GhiKOgXMyaxqKlKZ6yjiVcwcN6IDrMBl+/+RbaI=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6bae136720467cb8eeccb8502ff33b9b02d42ad4", + "rev": "5edd391e83ac908f009e494996eb6b0591df857f", "type": "github" }, "original": { @@ -235,11 +271,11 @@ ] }, "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", "owner": "ipetkov", "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", "type": "github" }, "original": { @@ -316,9 +352,45 @@ }, "devenv": { "inputs": { + "cachix": "cachix_2", + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "nix": "nix_2", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1719759336, + "narHash": "sha256-3a34VL/QnHprl5gMy9xlx6d8J+iNp+W88Ex8smkgH9M=", + "owner": "cachix", + "repo": "devenv", + "rev": "bb32aa986f2f695385e54428d0eaf7d05b31466e", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { "flake-compat": [ "conduwuit", "cachix", + "devenv", + "cachix", "flake-compat" ], "nix": "nix", @@ -327,6 +399,8 @@ "pre-commit-hooks": [ "conduwuit", "cachix", + "devenv", + "cachix", "pre-commit-hooks" ] }, @@ -655,30 +729,12 @@ }, "original": { "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", "ref": "main", "repo": "flake-utils", "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -693,9 +749,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -712,9 +768,9 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -759,7 +815,7 @@ "crane": "crane_6", "fenix": "fenix_3", "flake-compat": "flake-compat_9", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nix-filter": "nix-filter_3", "nixpkgs": "nixpkgs_8" }, @@ -784,11 +840,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1719992360, + "narHash": "sha256-SRq0ZRkqagqpMGVf4z9q9CIWRbPYjO7FTqSJyWh7nes=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "36e2f9da91ce8b63a549a47688ae60d47c50de4b", "type": "github" }, "original": { @@ -801,11 +857,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1716565485, - "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=", + "lastModified": 1719025212, + "narHash": "sha256-kD0yhjNStqC6uFqC1AxBwUpc/HlSFtiKrV+gwDyroDc=", "owner": "axboe", "repo": "liburing", - "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e", + "rev": "7b3245583069bd481190c9da18f22e9fc8c3a805", "type": "github" }, "original": { @@ -818,11 +874,11 @@ "mtxclientSrc": { "flake": false, "locked": { - "lastModified": 1718061774, - "narHash": "sha256-uIppA6FzWqPhXSQAnoiYi78NSA8+gpYf01E9XdLrvpU=", + "lastModified": 1719993585, + "narHash": "sha256-e1df2c2I2sLj2jQPKMFf0GAv8EUTSpVyLm6S/5UY4Xg=", "owner": "Nheko-reborn", "repo": "mtxclient", - "rev": "e87c6f4f7aa8fc8e5b1640454e8c94a4efd36e8a", + "rev": "018e208d92183df3326ddea0cb99809ba2583215", "type": "github" }, "original": { @@ -856,16 +912,18 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1708577783, - "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", "owner": "domenkozar", "repo": "nix", - "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", "type": "github" }, "original": { @@ -928,6 +986,8 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "poetry2nix", "nixpkgs" ] @@ -946,10 +1006,41 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1712911606, + "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_10", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "nixpkgs": "nixpkgs_10" }, "locked": { @@ -984,11 +1075,11 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1719663039, - "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "lastModified": 1719837636, + "narHash": "sha256-sTya/Vhqtdi7Kxx/eVldJRGTPKcyGgFG3ZugOqcbmiE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", + "rev": "28f8f3531ebdbea069995c20bd946a295699f275", "type": "github" }, "original": { @@ -1014,6 +1105,22 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-rory": { "locked": { "lastModified": 1719309243, @@ -1064,11 +1171,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1718811006, + "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "type": "github" }, "original": { @@ -1128,11 +1235,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1719690277, - "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -1208,11 +1315,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -1294,6 +1401,8 @@ "conduwuit", "cachix", "devenv", + "cachix", + "devenv", "nixpkgs" ] }, @@ -1314,7 +1423,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_5", "gitignore": "gitignore", "nixpkgs": [ "conduwuit", @@ -1324,11 +1432,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1715609711, - "narHash": "sha256-/5u29K0c+4jyQ8x7dUIEUWlz2BoTSZWUP2quPwFCE7M=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c182c876690380f8d3b9557c4609472ebfa1b141", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -1340,16 +1448,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1716773462, - "narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=", + "lastModified": 1719949653, + "narHash": "sha256-DYx7XHH2GEh17GukKhXs6laM6l+eugCmRkF0adpi9wk=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc", + "rev": "a935c0273e1ba44eacf88ce3685a9b9831486155", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.2.1", + "ref": "v9.3.1", "repo": "rocksdb", "type": "github" } @@ -1427,11 +1535,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1719716556, - "narHash": "sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8+awNMyqs=", + "lastModified": 1719873517, + "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b5974d4331fb6c893e808977a2e1a6d34b3162d6", + "rev": "a11224af8d824935f363928074b4717ca2e280db", "type": "github" }, "original": { @@ -1514,21 +1622,6 @@ "repo": "default", "type": "github" } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", |