forked from CCCHH/nix-infra
remove nixpkgs-unstable
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:
parent
f7ebe660fe
commit
e404d4740f
|
@ -3,13 +3,12 @@
|
||||||
# - https://woodpecker-ci.org/docs/administration/agent-config
|
# - https://woodpecker-ci.org/docs/administration/agent-config
|
||||||
# - https://woodpecker-ci.org/docs/administration/backends/docker
|
# - https://woodpecker-ci.org/docs/administration/backends/docker
|
||||||
|
|
||||||
{ config, pkgs, pkgs-unstable, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.woodpecker-agents.agents."docker" = {
|
services.woodpecker-agents.agents."docker" = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# Since we use woodpecker-server from unstable, use the agent from unstable as well.
|
package = pkgs.woodpecker-agent;
|
||||||
package = pkgs-unstable.woodpecker-agent;
|
|
||||||
extraGroups = [ "docker" ];
|
extraGroups = [ "docker" ];
|
||||||
environment = {
|
environment = {
|
||||||
WOODPECKER_SERVER = "localhost${config.services.woodpecker-server.environment.WOODPECKER_GRPC_ADDR}";
|
WOODPECKER_SERVER = "localhost${config.services.woodpecker-server.environment.WOODPECKER_GRPC_ADDR}";
|
||||||
|
|
|
@ -5,14 +5,12 @@
|
||||||
# - https://woodpecker-ci.org/docs/administration/forges/forgejo
|
# - https://woodpecker-ci.org/docs/administration/forges/forgejo
|
||||||
# - https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
|
# - https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
|
||||||
|
|
||||||
{ config, pkgs, pkgs-unstable, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.woodpecker-server = {
|
services.woodpecker-server = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# Use package from unstable to get at least version 2.6.0 for native Forgejo support.
|
package = pkgs.woodpecker-server;
|
||||||
# https://github.com/woodpecker-ci/woodpecker/releases/tag/v2.6.0
|
|
||||||
package = pkgs-unstable.woodpecker-server;
|
|
||||||
environment = {
|
environment = {
|
||||||
WOODPECKER_HOST = "https://woodpecker.hamburg.ccc.de";
|
WOODPECKER_HOST = "https://woodpecker.hamburg.ccc.de";
|
||||||
WOODPECKER_SERVER_ADDR = ":8001";
|
WOODPECKER_SERVER_ADDR = ":8001";
|
||||||
|
|
17
flake.lock
17
flake.lock
|
@ -68,27 +68,10 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731265036,
|
|
||||||
"narHash": "sha256-e5I+glVZwQvLT6WIeMFi0Mk+N/jkYauZ31ir2NRZcf8=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "8aed22ecd71e5b67e5299efae8b9dc580dec711c",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable-small",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
# https://nixos.org/manual/nixos/stable/#sec-upgrading
|
# https://nixos.org/manual/nixos/stable/#sec-upgrading
|
||||||
# https://github.com/NixOS/nixpkgs
|
# https://github.com/NixOS/nixpkgs
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05-small";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05-small";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
|
|
||||||
|
|
||||||
# Add nixos-generators as an input.
|
# Add nixos-generators as an input.
|
||||||
# See here: https://github.com/nix-community/nixos-generators#using-in-a-flake
|
# See here: https://github.com/nix-community/nixos-generators#using-in-a-flake
|
||||||
|
@ -23,10 +22,9 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-generators, sops-nix, ... }:
|
outputs = { self, nixpkgs, nixos-generators, sops-nix, ... }:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs-unstable = nixpkgs-unstable.legacyPackages."x86_64-linux";
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
overlays = {
|
overlays = {
|
||||||
|
@ -204,9 +202,6 @@
|
||||||
self.nixosModules.prometheus-exporter
|
self.nixosModules.prometheus-exporter
|
||||||
./config/hosts/woodpecker
|
./config/hosts/woodpecker
|
||||||
];
|
];
|
||||||
specialArgs = {
|
|
||||||
inherit pkgs-unstable;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
status = nixpkgs.lib.nixosSystem {
|
status = nixpkgs.lib.nixosSystem {
|
||||||
|
|
Loading…
Reference in a new issue