CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 2
Code Issues 1 Pull requests 1 Wiki Activity

remove nixpkgs-unstable

Browse source 
the current version of woodpecker-server in stable now has the features this was original used for, not other usages of unstable are in tree left so removing it.
This commit is contained in:
jopejoe1 2024-11-05 22:56:55 +01:00
commit e404d4740f
Signed by: jopejoe1
SSH key fingerprint: SHA256:iesNfL4WU4CO65/llSGLFqmep76oYWfWLfl6HUPt2nk
4 changed files with 5 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/hosts/woodpecker/woodpecker-agent/woodpecker-agent.nix
View file

@ -3,13 +3,12 @@
# - https://woodpecker-ci.org/docs/administration/agent-config
# - https://woodpecker-ci.org/docs/administration/backends/docker
{ config, pkgs, pkgs-unstable, ... }:
{ config, pkgs, ... }:
{
services.woodpecker-agents.agents."docker" = {
enable = true;
# Since we use woodpecker-server from unstable, use the agent from unstable as well.
package = pkgs-unstable.woodpecker-agent;
package = pkgs.woodpecker-agent;
extraGroups = [ "docker" ];
environment = {
WOODPECKER_SERVER = "localhost${config.services.woodpecker-server.environment.WOODPECKER_GRPC_ADDR}";

6
config/hosts/woodpecker/woodpecker-server/woodpecker-server.nix
View file

@ -5,14 +5,12 @@
# - https://woodpecker-ci.org/docs/administration/forges/forgejo
# - https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
{ config, pkgs, pkgs-unstable, ... }:
{ config, pkgs, ... }:
{
services.woodpecker-server = {
enable = true;
# Use package from unstable to get at least version 2.6.0 for native Forgejo support.
# https://github.com/woodpecker-ci/woodpecker/releases/tag/v2.6.0
package = pkgs-unstable.woodpecker-server;
package = pkgs.woodpecker-server;
environment = {
WOODPECKER_HOST = "https://woodpecker.hamburg.ccc.de";
WOODPECKER_SERVER_ADDR = ":8001";