From 71c086cd45b24331e0164d6b19e55be9ac7f9188 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 29 Aug 2024 10:51:45 +0200 Subject: [PATCH] Update flake lock & disable cinny for now --- flake.lock | 592 ++++++----------------- nixos/server/package-configs/default.nix | 2 +- 2 files changed, 141 insertions(+), 453 deletions(-) diff --git a/flake.lock b/flake.lock index 92fd07b..5c813e1 100644 --- a/flake.lock +++ b/flake.lock @@ -8,29 +8,6 @@ "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, - "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, - "attic_2": { - "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_2" - }, "locked": { "lastModified": 1720542474, "narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=", @@ -60,11 +37,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723325427, - "narHash": "sha256-aOZcDWVv2b0MjkzZIHdEM1NIoO/0U1XtuVD4jGnMxLk=", + "lastModified": 1724456070, + "narHash": "sha256-Mbi9N8S3OjS1XywvkraGf+jmOXZrjhTjVoWYxSf+XSY=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "8b93af8747bd9de6bce60d1da2d6c8f2728f9ce3", + "rev": "b422b19f636329e1a082bcacd3ac6b485d7a5b3e", "type": "github" }, "original": { @@ -92,8 +69,8 @@ "cachix": { "inputs": { "devenv": "devenv", - "flake-compat": "flake-compat_6", - "nixpkgs": "nixpkgs_5", + "flake-compat": "flake-compat_4", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -149,11 +126,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1723691425, - "narHash": "sha256-F25VvHFMaqr26b7goaVWspXaK6XTRFz8RnILV+9OPkk=", + "lastModified": 1724469296, + "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=", "owner": "catppuccin", "repo": "nix", - "rev": "552056779a136092eb6358c573d925630172fc30", + "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb", "type": "github" }, "original": { @@ -163,23 +140,6 @@ } }, "complement": { - "flake": false, - "locked": { - "lastModified": 1715700731, - "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", - "owner": "matrix-org", - "repo": "complement", - "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", - "type": "github" - }, - "original": { - "owner": "matrix-org", - "ref": "main", - "repo": "complement", - "type": "github" - } - }, - "complement_2": { "flake": false, "locked": { "lastModified": 1722323564, @@ -196,52 +156,28 @@ "type": "github" } }, - "conduit": { + "conduwuit": { "inputs": { "attic": "attic", + "cachix": "cachix", "complement": "complement", "crane": "crane_3", "fenix": "fenix_2", - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_2", - "rocksdb": "rocksdb" - }, - "locked": { - "lastModified": 1715983991, - "narHash": "sha256-2OL8zPpDHXgOxNqXlWqd1aJ2uZJCAuoqBWaabwWUg2M=", - "path": "/nix/store/2h6yxx9z1if5pqwsr7m6pr07h8i498qz-source", - "rev": "8bffcfe82b3cc50bb095f41afc585fabacb963e3", - "type": "path" - }, - "original": { - "id": "conduit", - "type": "indirect" - } - }, - "conduwuit": { - "inputs": { - "attic": "attic_2", - "cachix": "cachix", - "complement": "complement_2", - "crane": "crane_5", - "fenix": "fenix_3", - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_3", "liburing": "liburing", - "nix-filter": "nix-filter_2", + "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ], - "rocksdb": "rocksdb_2" + "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1723861150, - "narHash": "sha256-Px5wNTHVgTAYKCoyaBn8HCuzjBhz/xBXZwMJLLcIxqs=", + "lastModified": 1724781403, + "narHash": "sha256-MO4WUq7p4SRnGVtxuDH5PLZnPgwl1ZtoXmwt5R/OTwc=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "28cd784972f9e6e78a77ee54ca07d998ca15a788", + "rev": "d26493562528172595ea063c55f76b7eb0d6b7c4", "type": "github" }, "original": { @@ -272,50 +208,6 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduit", - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", - "owner": "ipetkov", - "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "inputs": { - "nixpkgs": [ - "conduit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715274763, - "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", - "owner": "ipetkov", - "repo": "crane", - "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { "inputs": { "nixpkgs": [ "conduwuit", @@ -337,7 +229,7 @@ "type": "github" } }, - "crane_5": { + "crane_3": { "inputs": { "nixpkgs": [ "conduwuit", @@ -359,7 +251,7 @@ "type": "github" } }, - "crane_6": { + "crane_4": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -380,7 +272,7 @@ "type": "github" } }, - "crane_7": { + "crane_5": { "inputs": { "nixpkgs": [ "zjstatus", @@ -388,11 +280,11 @@ ] }, "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", + "lastModified": 1724537630, + "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", "owner": "ipetkov", "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", + "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", "type": "github" }, "original": { @@ -445,7 +337,7 @@ "flake-compat" ], "nix": "nix", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "poetry2nix": "poetry2nix", "pre-commit-hooks": [ "conduwuit", @@ -477,11 +369,11 @@ ] }, "locked": { - "lastModified": 1723685519, - "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", + "lastModified": 1724895876, + "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=", "owner": "nix-community", "repo": "disko", - "rev": "276a0d055a720691912c6a34abb724e395c8e38a", + "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3", "type": "github" }, "original": { @@ -513,35 +405,12 @@ } }, "fenix_2": { - "inputs": { - "nixpkgs": [ - "conduit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1715322226, - "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", - "owner": "nix-community", - "repo": "fenix", - "rev": "297c756ba6249d483c1dafe42378560458842173", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "fenix", - "type": "github" - } - }, - "fenix_3": { "inputs": { "nixpkgs": [ "conduwuit", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src_3" + "rust-analyzer-src": "rust-analyzer-src_2" }, "locked": { "lastModified": 1720852044, @@ -574,22 +443,6 @@ "type": "github" } }, - "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-compat_2": { "flake": false, "locked": { @@ -609,16 +462,15 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { "owner": "edolstra", - "ref": "master", "repo": "flake-compat", "type": "github" } @@ -626,11 +478,11 @@ "flake-compat_4": { "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": { @@ -642,11 +494,11 @@ "flake-compat_5": { "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": { @@ -667,6 +519,7 @@ }, "original": { "owner": "edolstra", + "ref": "master", "repo": "flake-compat", "type": "github" } @@ -688,23 +541,6 @@ } }, "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "master", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_9": { "flake": false, "locked": { "lastModified": 1696426674, @@ -780,40 +616,6 @@ "inputs": { "systems": "systems" }, - "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_3": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1689068808, "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", @@ -828,9 +630,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -847,9 +649,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -865,9 +667,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -935,11 +737,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -952,14 +754,14 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1723743257, - "narHash": "sha256-BunNxd6XYA9cyjgxOlGQrlgkiN8ClejGVkE8KWe9F2U=", + "lastModified": 1724908834, + "narHash": "sha256-QYtm4H+nzO8lYJYN6TfitmZ5jvb94YqY5MGWvZRCre8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e4e0ca14918919300e04e80c34036028b4370640", + "rev": "0ce5684924f553c65828041a86e7e3e09aeaac29", "type": "github" }, "original": { @@ -970,10 +772,10 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_6", - "flake-compat": "flake-compat_9", + "crane": "crane_4", + "flake-compat": "flake-compat_7", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -1010,7 +812,7 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_3", "nixpkgs": [ "conduwuit", "cachix", @@ -1052,22 +854,6 @@ "type": "github" } }, - "nix-filter_2": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "main", - "repo": "nix-filter", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -1123,11 +909,11 @@ ] }, "locked": { - "lastModified": 1723352546, - "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", + "lastModified": 1724576102, + "narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", + "rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5", "type": "github" }, "original": { @@ -1169,11 +955,11 @@ }, "nixlib": { "locked": { - "lastModified": 1723337705, - "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=", + "lastModified": 1724547350, + "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a", + "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", "type": "github" }, "original": { @@ -1190,11 +976,11 @@ ] }, "locked": { - "lastModified": 1723870831, - "narHash": "sha256-rXQKvogLHY3BxRVVt5unpbi0zpRf965f57gplWSzQ5k=", + "lastModified": 1724893087, + "narHash": "sha256-M3+Z8SSpzKPQ+/vw9a99G9HfqKWbVGzhFz4p3KAX0NI=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "32e9d82bada67fc5155e8d4d99b6fc3a1765bfdc", + "rev": "0dd0205bc3f6d602ddb62aaece5f62a8715a9e85", "type": "github" }, "original": { @@ -1205,11 +991,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724878143, + "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "type": "github" }, "original": { @@ -1252,11 +1038,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1723893954, - "narHash": "sha256-InDwKFEbiv9cYr+gXdQU2x6TUOkpHcKUIfOTYUu+THc=", + "lastModified": 1724918179, + "narHash": "sha256-vQ1gVPgJiDHPTjhwCqr9c/Z1YEhRzvhy6NvH2En200c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b503a951d1536dd5467fe8f1956f9312327cc89", + "rev": "9e073dc84d49aca4f845305641c552d9332b212f", "type": "github" }, "original": { @@ -1314,22 +1100,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1718811006, "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", @@ -1345,7 +1115,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -1361,7 +1131,7 @@ "type": "github" } }, - "nixpkgs-stable_5": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1721524707, "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", @@ -1379,11 +1149,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -1393,71 +1163,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1721466660, - "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1723703277, - "narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8b908192e64224420e2d59dfd9b2e4309e154c5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1692808169, "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", @@ -1473,7 +1179,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1719848872, "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", @@ -1489,13 +1195,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -1505,7 +1211,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1722264024, "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", @@ -1521,13 +1227,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -1537,7 +1243,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -1552,6 +1258,38 @@ "type": "indirect" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1724748588, + "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -1562,11 +1300,11 @@ ] }, "locked": { - "lastModified": 1723804780, - "narHash": "sha256-uuiu1UAfYr2Lo+5Ul6eA0UIYouoPvH9aIfYbq7wVF6c=", + "lastModified": 1724556439, + "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", "owner": "pjones", "repo": "plasma-manager", - "rev": "8726ecaa8b8c06910ef31abced57bf08a59730a1", + "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", "type": "github" }, "original": { @@ -1577,7 +1315,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "conduwuit", @@ -1604,14 +1342,14 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_5", "gitignore": "gitignore", "nixpkgs": [ "conduwuit", "cachix", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1719259945, @@ -1638,7 +1376,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1721042469, @@ -1655,23 +1393,6 @@ } }, "rocksdb": { - "flake": false, - "locked": { - "lastModified": 1714770052, - "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=", - "owner": "girlbossceo", - "repo": "rocksdb", - "rev": "db6df0b185774778457dabfcbd822cb81760cade", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "ref": "v9.1.1", - "repo": "rocksdb", - "type": "github" - } - }, - "rocksdb_2": { "flake": false, "locked": { "lastModified": 1720900786, @@ -1692,18 +1413,17 @@ "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", - "conduit": "conduit", "conduwuit": "conduwuit", "disko": "disko", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_4", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1730,23 +1450,6 @@ } }, "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1715255944, - "narHash": "sha256-vLLgYpdtKBaGYTamNLg1rbRo1bPXp4Jgded/gnprPVw=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "5bf2f85c8054d80424899fa581db1b192230efb5", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_3": { "flake": false, "locked": { "lastModified": 1720717809, @@ -1792,11 +1495,11 @@ ] }, "locked": { - "lastModified": 1723774846, - "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=", + "lastModified": 1724811750, + "narHash": "sha256-PvhVgQ1rm3gfhK7ts4emprhh/KMkFwXogmgsQ3srR7g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f", + "rev": "6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6", "type": "github" }, "original": { @@ -1808,8 +1511,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_10", - "nixpkgs": "nixpkgs_9", + "flake-compat": "flake-compat_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { @@ -1829,8 +1532,8 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_10", - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs": "nixpkgs_8", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1723501126, @@ -1906,21 +1609,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1944,17 +1632,17 @@ }, "zjstatus": { "inputs": { - "crane": "crane_7", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_11", + "crane": "crane_5", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_9", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1723818372, - "narHash": "sha256-dxRAONapqZRIlNfDyh/RVh011pdklBEDr92OsJizkAA=", + "lastModified": 1724858904, + "narHash": "sha256-QGzfl4YHTl/HuYy6oe/OqAX8xViYht1BCCIpWq7uH5U=", "owner": "dj95", "repo": "zjstatus", - "rev": "671e0d12737cd8b269ca4408cfc67295ad3760b7", + "rev": "b2f15019bdfc04f65cac7cd073418ac6ad4dbddc", "type": "github" }, "original": { diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index ef92293..6384555 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -17,7 +17,7 @@ ./roundcube ./coturn ./dashboard - ./cinny + #./cinny #./firefox-sync ./writefreely ];