Skip to content

Commit d134fe4

Browse files
committed
move nixos modules to its own directory.
we mix modules and packages which can be confusing.
1 parent 1d1b5bc commit d134fe4

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

flake.nix

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
{
2929
imports =
3030
[
31+
./nixosModules/flake-module.nix
3132
./nix/checks/flake-module.nix
3233
]
3334
++ inputs.nixpkgs.lib.optional (inputs.treefmt-nix ? flakeModule) ./nix/treefmt/flake-module.nix
@@ -56,13 +57,6 @@
5657
];
5758

5859
flake = {
59-
nixosModules.buildbot-master.imports = [
60-
./nix/master.nix
61-
];
62-
63-
nixosModules.buildbot-worker.imports = [
64-
./nix/worker.nix
65-
];
6660

6761
nixosConfigurations =
6862
let
File renamed without changes.

nixosModules/flake-module.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
flake = {
3+
nixosModules.buildbot-master = ./master.nix;
4+
nixosModules.buildbot-worker = ./worker.nix;
5+
};
6+
}
File renamed without changes.
File renamed without changes.

nix/packages.nix renamed to nixosModules/packages.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ in
3535
};
3636

3737
buildbot-nix = lib.mkOption {
38-
default = cfg.python.pkgs.callPackage ./buildbot-nix.nix { };
38+
default = cfg.python.pkgs.callPackage ../packages/buildbot-nix.nix { };
3939
};
4040

4141
buildbot-plugins = lib.mkOption {
@@ -45,12 +45,12 @@ in
4545

4646
buildbot-effects = lib.mkOption {
4747
type = lib.types.package;
48-
default = cfg.python.pkgs.callPackage ./buildbot-effects.nix { };
48+
default = cfg.python.pkgs.callPackage ../packages/buildbot-effects.nix { };
4949
};
5050

5151
buildbot-gitea = lib.mkOption {
5252
default = (
53-
cfg.python.pkgs.callPackage ./buildbot-gitea.nix {
53+
cfg.python.pkgs.callPackage ../packages/buildbot-gitea.nix {
5454
buildbot = cfg.buildbot;
5555
}
5656
);
File renamed without changes.

0 commit comments

Comments
 (0)