diff options
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/continuous-integration/github-runner.nix | 25 | ||||
-rw-r--r-- | nixos/modules/services/continuous-integration/github-runners.nix | 4 |
2 files changed, 4 insertions, 25 deletions
diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix deleted file mode 100644 index 27cfee92c75a..000000000000 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config -, pkgs -, lib -, ... -}@args: - -with lib; - -let - cfg = config.services.github-runner; -in - -{ - options.services.github-runner = import ./github-runner/options.nix (args // { - # Users don't need to specify options.services.github-runner.name; it will default - # to the hostname. - includeNameDefault = true; - }); - - config = mkIf cfg.enable { - services.github-runners.${cfg.name} = cfg; - }; - - meta.maintainers = with maintainers; [ veehaitch newam thomasjm ]; -} diff --git a/nixos/modules/services/continuous-integration/github-runners.nix b/nixos/modules/services/continuous-integration/github-runners.nix index ea3f192f6363..3af1c4a49871 100644 --- a/nixos/modules/services/continuous-integration/github-runners.nix +++ b/nixos/modules/services/continuous-integration/github-runners.nix @@ -12,6 +12,10 @@ let in { + imports = [ + mkRemovedOptionModule [ "services" "github-runner" ] "Use `services.github-runners.*` instead" + ]; + options.services.github-runners = mkOption { default = {}; type = with types; attrsOf (submodule { options = import ./github-runner/options.nix (args // { |