From 7b6779f2b5e5aae5f3608371b157d70dcb24f2d8 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 1 Aug 2023 14:57:22 +0000 Subject: [PATCH] modules: services: woodpecker: default packages Now that v1.0.0 is on nixpkgs, no need for my custom packages. --- modules/services/woodpecker/agent-docker/default.nix | 4 +--- modules/services/woodpecker/agent-exec/default.nix | 2 -- modules/services/woodpecker/server/default.nix | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/services/woodpecker/agent-docker/default.nix b/modules/services/woodpecker/agent-docker/default.nix index 2d431bc..b18d075 100644 --- a/modules/services/woodpecker/agent-docker/default.nix +++ b/modules/services/woodpecker/agent-docker/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.woodpecker; @@ -10,8 +10,6 @@ in agents.docker = { enable = true; - package = pkgs.ambroisie.woodpecker-agent; - environment = { WOODPECKER_SERVER = "localhost:${toString cfg.rpcPort}"; WOODPECKER_MAX_WORKFLOWS = "10"; diff --git a/modules/services/woodpecker/agent-exec/default.nix b/modules/services/woodpecker/agent-exec/default.nix index 68510d7..db98241 100644 --- a/modules/services/woodpecker/agent-exec/default.nix +++ b/modules/services/woodpecker/agent-exec/default.nix @@ -10,8 +10,6 @@ in agents.exec = { enable = true; - package = pkgs.ambroisie.woodpecker-agent; - environment = { WOODPECKER_SERVER = "localhost:${toString cfg.rpcPort}"; WOODPECKER_MAX_WORKFLOWS = "10"; diff --git a/modules/services/woodpecker/server/default.nix b/modules/services/woodpecker/server/default.nix index 590f07c..152e707 100644 --- a/modules/services/woodpecker/server/default.nix +++ b/modules/services/woodpecker/server/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.woodpecker; in @@ -7,8 +7,6 @@ in services.woodpecker-server = { enable = true; - package = pkgs.ambroisie.woodpecker-server; - environment = { WOODPECKER_OPEN = "true"; WOODPECKER_HOST = "https://woodpecker.${config.networking.domain}";