diff --git a/flake.lock b/flake.lock index ddd8d3ef..7bcd9ff0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,19 +1,42 @@ { "nodes": { - "deploy-rs": { + "colmena": { "inputs": { "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], + "stable": "stable", "utils": "utils" }, "locked": { - "lastModified": 1652079807, - "narHash": "sha256-aCs1EwO9K2yJ1DcT4+4g7BMlJBWP7Xjs4k5i8ueR8PU=", + "lastModified": 1653210933, + "narHash": "sha256-n6Hk/zPHcjloi0E/miKGnXrWROha90uan2CFQV7oaqI=", + "owner": "zhaofengli", + "repo": "colmena", + "rev": "429a0f5aa1d1bac06234e2f0c02d5b63a850d940", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "colmena", + "type": "github" + } + }, + "deploy-rs": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_2" + }, + "locked": { + "lastModified": 1653594315, + "narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=", "owner": "serokell", "repo": "deploy-rs", - "rev": "690f698b18345d894784752b5fa93b9b8f3cc29f", + "rev": "184349d8149436748986d1bdba087e4149e9c160", "type": "github" }, "original": { @@ -23,6 +46,22 @@ } }, "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" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1648199409, @@ -38,7 +77,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1627913399, @@ -53,7 +92,7 @@ "type": "indirect" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1627913399, @@ -164,14 +203,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils_3" }, "locked": { - "lastModified": 1653372067, - "narHash": "sha256-1+fD3EHTbUSoKcabe9WadVe9fFnG5f2ODWC+WpR8exc=", + "lastModified": 1653614444, + "narHash": "sha256-JDXshcep5PjUx+AM68FunQgpFtS+B8/U/ow0gROln+k=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "6008e29999eb32bd7880ae53e13f83d9181f04bb", + "rev": "0147a798063462fb2c4644cdb7936d050d3b704f", "type": "github" }, "original": { @@ -218,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653427793, - "narHash": "sha256-h6y/I5O/QTawjny6GfovRSUbaEAvswfRXFMuOhVYwBQ=", + "lastModified": 1653602240, + "narHash": "sha256-Gt3J9eZQ12H6niBjmqd6cNCY4g/EDbcMTRGyCmAQurA=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "bef8053f86b8702d57601972f782186b7269db69", + "rev": "c2f9aad978affdbfd20578bc84a4f0a170ff8a6f", "type": "github" }, "original": { @@ -264,6 +303,7 @@ }, "root": { "inputs": { + "colmena": "colmena", "deploy-rs": "deploy-rs", "minecraft-servers": "minecraft-servers", "nixpkgs": "nixpkgs", @@ -276,7 +316,7 @@ "deploy-rs": [ "deploy-rs" ], - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", "gitignore-nix": "gitignore-nix", "nix": "nix", @@ -285,11 +325,11 @@ ] }, "locked": { - "lastModified": 1653404524, - "narHash": "sha256-Mu3qgXABzAM9T+4dWmV3OOYFydxv28al7cTdiUK6h3s=", + "lastModified": 1653431509, + "narHash": "sha256-4PUKylYuWy0Wlaz8lmbuKq7ok3biV/P6GeLKyO1opEk=", "owner": "serokell", "repo": "serokell.nix", - "rev": "3b39a9000c7652cf7693b70c13c7e1564b0cf333", + "rev": "b69317c1304a9c51d7a20ec36ab31f853887e96d", "type": "github" }, "original": { @@ -298,7 +338,38 @@ "type": "github" } }, + "stable": { + "locked": { + "lastModified": 1653087707, + "narHash": "sha256-zfno3snrzZTWQ2B7K53QHrGZwrjnJLTRPalymrSsziU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, "utils": { + "locked": { + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { "locked": { "lastModified": 1648297722, "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", @@ -313,7 +384,7 @@ "type": "github" } }, - "utils_2": { + "utils_3": { "inputs": { "flake-utils": "flake-utils" }, @@ -333,7 +404,7 @@ }, "vault-secrets": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_3", "nix": "nix_2", "nixpkgs": [ diff --git a/flake.nix b/flake.nix index c2dd2d5c..810bdbbb 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,9 @@ deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; + + colmena.url = "github:zhaofengli/colmena"; + colmena.inputs.nixpkgs.follows = "nixpkgs"; serokell-nix.url = "github:serokell/serokell.nix"; serokell-nix.inputs.nixpkgs.follows = "nixpkgs";