From 68d956f1ba8889292c45bf6562639575a8026d47 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 17 Jul 2024 14:47:38 +0200 Subject: [PATCH] flake: add buildbot-nix on the refactor branch Signed-off-by: Raito Bezarius --- flake.lock | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 5 ++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 066cd89..0f3747d 100644 --- a/flake.lock +++ b/flake.lock @@ -55,6 +55,29 @@ "type": "github" } }, + "buildbot-nix": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1715022238, + "narHash": "sha256-sDD6WWJXJ/1j07aQE0RAUlrQBekXABtEKm7gtaTN45w=", + "ref": "refs/heads/refactor", + "rev": "d5e3345097cdda5c74bccddb27abb5b5c84eff5b", + "revCount": 257, + "type": "git", + "url": "https://git.lix.systems/lix-project/buildbot-nix.git" + }, + "original": { + "ref": "refs/heads/refactor", + "type": "git", + "url": "https://git.lix.systems/lix-project/buildbot-nix.git" + } + }, "colmena": { "inputs": { "flake-compat": "flake-compat", @@ -133,6 +156,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "buildbot-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "hydra", @@ -254,7 +298,7 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "lix": [ "hydra", "lix" @@ -264,7 +308,7 @@ "hydra", "nixpkgs" ], - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1721195872, @@ -404,6 +448,7 @@ "root": { "inputs": { "agenix": "agenix", + "buildbot-nix": "buildbot-nix", "colmena": "colmena", "hydra": "hydra", "lix": [ @@ -484,6 +529,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "buildbot-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708897213, + "narHash": "sha256-QECZB+Hgz/2F/8lWvHNk05N6NU/rD9bWzuNn6Cv8oUk=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e497a9ddecff769c2a7cbab51e1ed7a8501e7a3a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "hydra", diff --git a/flake.nix b/flake.nix index 1a929e8..c8eef8f 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,9 @@ nix-gerrit.url = "git+https://git.lix.systems/the-distro/nix-gerrit.git"; nix-gerrit.inputs.nixpkgs.follows = "nixpkgs"; + buildbot-nix.url = "git+https://git.lix.systems/lix-project/buildbot-nix.git?ref=refs/heads/refactor"; + buildbot-nix.inputs.nixpkgs.follows = "nixpkgs"; + lix.follows = "hydra/lix"; }; @@ -73,6 +76,8 @@ commonModules = [ inputs.agenix.nixosModules.default inputs.hydra.nixosModules.hydra + inputs.buildbot-nix.nixosModules.buildbot-coordinator + inputs.buildbot-nix.nixosModules.buildbot-worker ./services ./common