diff --git a/flake.lock b/flake.lock index 28b12df..a950e9a 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1662241716, - "narHash": "sha256-urqPvSvvGUhkwzTDxUI8N1nsdMysbAfjmBNZaTYBZRU=", + "lastModified": 1665870395, + "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "owner": "ryantm", "repo": "agenix", - "rev": "c96da5835b76d3d8e8d99a0fec6fe32f8539ee2e", + "rev": "a630400067c6d03c9b3e0455347dc8559db14288", "type": "github" }, "original": { @@ -45,30 +45,6 @@ "inputs": { "fenix": "fenix", "flakeCompat": "flakeCompat", - "nixpkgs": [ - "depot", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658427149, - "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, - "alejandra_2": { - "inputs": { - "fenix": "fenix_2", - "flakeCompat": "flakeCompat_2", "nixpkgs": [ "dream2nix", "nixpkgs" @@ -105,6 +81,21 @@ "type": "github" } }, + "blank": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, "crane": { "flake": false, "locked": { @@ -137,22 +128,6 @@ "type": "github" } }, - "crane_3": { - "flake": false, - "locked": { - "lastModified": 1661875961, - "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat", @@ -179,7 +154,7 @@ "inputs": { "flake-compat": [ "depot", - "repin-flake-compat" + "blank" ], "nixpkgs": [ "depot", @@ -209,6 +184,7 @@ "depot": { "inputs": { "agenix": "agenix_2", + "blank": "blank", "deploy-rs": "deploy-rs_2", "devshell": "devshell", "dream2nix": "dream2nix", @@ -219,19 +195,21 @@ "nar-serve": "nar-serve", "nix-filter": "nix-filter", "nix-super": "nix-super", + "nixos-command": "nixos-command", "nixpkgs": [ "nixpkgs" ], - "repin-flake-compat": "repin-flake-compat", + "nixpkgs-lib": "nixpkgs-lib", + "poetry2nix": "poetry2nix", "repin-flake-utils": "repin-flake-utils" }, "locked": { "host": "git.privatevoid.net", - "lastModified": 1665223929, - "narHash": "sha256-iWk1UvXm5tnes87aCvP1ySTHDdi1jYbtEUuRUFRnLlo=", + "lastModified": 1666398596, + "narHash": "sha256-HlC0jREIJD+Cz2bBc5SLT/dMiIemEZbdyUh5yG3urwU=", "owner": "private-void", "repo": "infrastructure", - "rev": "94e69da757622b963cb0e648dbcf82bc80b32416", + "rev": "fc2944edf242a4360b5a333ee87b0cbfcbe7bf7d", "type": "gitlab" }, "original": { @@ -283,22 +261,6 @@ } }, "devshell_3": { - "flake": false, - "locked": { - "lastModified": 1653917170, - "narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=", - "owner": "numtide", - "repo": "devshell", - "rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_4": { "flake": false, "locked": { "lastModified": 1660811669, @@ -316,28 +278,53 @@ }, "dream2nix": { "inputs": { - "alejandra": "alejandra", - "crane": "crane", - "devshell": "devshell_2", + "alejandra": [ + "depot", + "blank" + ], + "all-cabal-json": [ + "depot", + "blank" + ], + "crane": [ + "depot", + "blank" + ], + "devshell": [ + "depot", + "blank" + ], "flake-utils-pre-commit": [ "depot", - "repin-flake-utils" + "blank" + ], + "gomod2nix": [ + "depot", + "blank" + ], + "mach-nix": [ + "depot", + "blank" ], - "gomod2nix": "gomod2nix", - "mach-nix": "mach-nix", "nixpkgs": [ "depot", "nixpkgs" ], - "poetry2nix": "poetry2nix", - "pre-commit-hooks": "pre-commit-hooks" + "poetry2nix": [ + "depot", + "poetry2nix" + ], + "pre-commit-hooks": [ + "depot", + "blank" + ] }, "locked": { - "lastModified": 1663716058, - "narHash": "sha256-VT/JDqI/OHr68fVcOl4dr+ob2GPAKQIIG9FATr+0b0U=", + "lastModified": 1665936754, + "narHash": "sha256-eAugmGOb0OtfZPBikOIbfZg0BV/sBui4EY1yfVFotAs=", "owner": "nix-community", "repo": "dream2nix", - "rev": "b54f6403f4e0b4696f0502fbf4ead24d874fadd4", + "rev": "fa708ced6f97b266092a54fc881b8f373290f505", "type": "github" }, "original": { @@ -348,18 +335,18 @@ }, "dream2nix_2": { "inputs": { - "alejandra": "alejandra_2", + "alejandra": "alejandra", "all-cabal-json": "all-cabal-json", - "crane": "crane_2", - "devshell": "devshell_3", + "crane": "crane", + "devshell": "devshell_2", "flake-utils-pre-commit": "flake-utils-pre-commit", - "gomod2nix": "gomod2nix_2", - "mach-nix": "mach-nix_2", + "gomod2nix": "gomod2nix", + "mach-nix": "mach-nix", "nixpkgs": [ "nixpkgs" ], "poetry2nix": "poetry2nix_2", - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { "lastModified": 1665786447, @@ -382,7 +369,7 @@ "nci", "nixpkgs" ], - "crane": "crane_3", + "crane": "crane_2", "devshell": [ "helix", "nci", @@ -436,7 +423,6 @@ "fenix": { "inputs": { "nixpkgs": [ - "depot", "dream2nix", "alejandra", "nixpkgs" @@ -457,29 +443,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "dream2nix", - "alejandra", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -498,17 +461,17 @@ }, "flake-parts": { "inputs": { - "nixpkgs": [ + "nixpkgs-lib": [ "depot", - "nixpkgs" + "nixpkgs-lib" ] }, "locked": { - "lastModified": 1663686189, - "narHash": "sha256-cgWGo0SLM4RX0DqodeFHsU0PRGlmz6AOSF1lmX21bvg=", + "lastModified": 1665512413, + "narHash": "sha256-IeuXVWD+VkmdVdC3d2i7mdEWhNSEvc2GUdui09zAGpE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f17e9dba098c0a7bca10029bec5384fd6425c157", + "rev": "08ce9a42392cf8c7fdabf7c51069381ba5455dc7", "type": "github" }, "original": { @@ -593,22 +556,6 @@ "type": "github" } }, - "flakeCompat_2": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "gomod2nix": { "flake": false, "locked": { @@ -625,22 +572,6 @@ "type": "github" } }, - "gomod2nix_2": { - "flake": false, - "locked": { - "lastModified": 1627572165, - "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "helix": { "inputs": { "nci": "nci", @@ -669,7 +600,10 @@ "depot", "flake-parts" ], - "nix-darwin": "nix-darwin", + "nix-darwin": [ + "depot", + "blank" + ], "nixpkgs": [ "depot", "nixpkgs" @@ -677,11 +611,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1662558281, - "narHash": "sha256-FOsw9gQo4aATPKI0y2zW0PQGu+eoMcscj8ulScadbis=", + "lastModified": 1665739697, + "narHash": "sha256-UvjnKP3kMtW/UzV8x/ltzO16cIf/wS+a4LlEpXA/GPw=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "64d13d65d757170eb733058b578276cc51d5de2d", + "rev": "b0207f60cab691961ae98c2807f2bf443ebfc2d8", "type": "github" }, "original": { @@ -698,11 +632,11 @@ ] }, "locked": { - "lastModified": 1661435920, - "narHash": "sha256-KD9zq5llB8l/gCnPv9Qa7T4Vb9o8pT6dPj/B1c+PXu4=", + "lastModified": 1664386111, + "narHash": "sha256-VCQzAMEjgXNTbAB8v5eQav/KpOC44E/RapXz1KPhroE=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "f659b6f02f216d49ade19db052c6e28d6c684986", + "rev": "ac59fc51b1f25b6436ed55d7cdb5fdd051cd4dbf", "type": "github" }, "original": { @@ -796,26 +730,11 @@ "type": "indirect" } }, - "mach-nix_2": { - "flake": false, - "locked": { - "lastModified": 1634711045, - "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", - "type": "github" - }, - "original": { - "id": "mach-nix", - "type": "indirect" - } - }, "mms": { "inputs": { "flake-compat": [ "depot", - "repin-flake-compat" + "blank" ], "flake-utils": [ "depot", @@ -872,7 +791,7 @@ }, "nci": { "inputs": { - "devshell": "devshell_4", + "devshell": "devshell_3", "dream2nix": "dream2nix_3", "nixpkgs": [ "helix", @@ -939,28 +858,6 @@ "url": "https://git.privatevoid.net/max/nix-crx.git" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "depot", - "hercules-ci-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1657835815, - "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "54a24f042f93c79f5679f133faddedec61955cf2", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-filter": { "locked": { "lastModified": 1661201956, @@ -983,7 +880,10 @@ "depot", "nixpkgs" ], - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-regression": [ + "depot", + "blank" + ] }, "locked": { "host": "git.privatevoid.net", @@ -1005,7 +905,7 @@ "inputs": { "lowdown-src": "lowdown-src_2", "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression_2" + "nixpkgs-regression": "nixpkgs-regression" }, "locked": { "host": "git.privatevoid.net", @@ -1023,6 +923,35 @@ "type": "gitlab" } }, + "nixos-command": { + "inputs": { + "flake-utils": [ + "depot", + "repin-flake-utils" + ], + "nixpkgs": [ + "depot", + "nixpkgs" + ], + "poetry2nix": [ + "depot", + "poetry2nix" + ] + }, + "locked": { + "lastModified": 1662057103, + "narHash": "sha256-8czeYcJPbKFcX/F/GuBjgIOXzqNwqr0iOjY5mImgSaM=", + "owner": "max-privatevoid", + "repo": "nixos-command", + "rev": "9d1015b4d366fab6ae46f830e1699a7b9b5dea18", + "type": "github" + }, + "original": { + "owner": "max-privatevoid", + "repo": "nixos-command", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1665734422, @@ -1075,23 +1004,25 @@ "type": "github" } }, - "nixpkgs-regression": { + "nixpkgs-lib": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "dir": "lib", + "lastModified": 1665870850, + "narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f", "type": "github" }, "original": { + "dir": "lib", "owner": "NixOS", + "ref": "nixos-22.05-small", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, - "nixpkgs-regression_2": { + "nixpkgs-regression": { "locked": { "lastModified": 1643052045, "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", @@ -1124,18 +1055,26 @@ } }, "poetry2nix": { - "flake": false, + "inputs": { + "flake-utils": [ + "depot", + "repin-flake-utils" + ], + "nixpkgs": [ + "depot", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1632969109, - "narHash": "sha256-jPDclkkiAy5m2gGLBlKgH+lQtbF7tL4XxBrbSzw+Ioc=", + "lastModified": 1665455310, + "narHash": "sha256-gEG1UiKz65SNWDU1NJmxLneo+kn7WjxrfucSk1zhU6o=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "aee8f04296c39d88155e05d25cfc59dfdd41cc77", + "rev": "d62ba59f1e28c382665c57203a4b9ad11fd7f449", "type": "github" }, "original": { "owner": "nix-community", - "ref": "1.21.0", "repo": "poetry2nix", "type": "github" } @@ -1160,12 +1099,10 @@ "pre-commit-hooks": { "inputs": { "flake-utils": [ - "depot", "dream2nix", "flake-utils-pre-commit" ], "nixpkgs": [ - "depot", "dream2nix", "nixpkgs" ] @@ -1208,47 +1145,6 @@ "type": "github" } }, - "pre-commit-hooks_2": { - "inputs": { - "flake-utils": [ - "dream2nix", - "flake-utils-pre-commit" - ], - "nixpkgs": [ - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646153636, - "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "repin-flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "repin-flake-utils": { "locked": { "lastModified": 1659877975, @@ -1298,23 +1194,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "flake-utils": "flake-utils_2",