CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 3
Code Issues Pull requests 2 Projects 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
parent 12ed0e954b
commit 0d7805dc9c
Signed by: jopejoe1
SSH key fingerprint: SHA256:iesNfL4WU4CO65/llSGLFqmep76oYWfWLfl6HUPt2nk
4 changed files with 5 additions and 30 deletions
Show stats 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";

17
flake.lock
View file

@ -68,27 +68,10 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1730449684,
"narHash": "sha256-Hlv3rTPxnO+DpKRXw9yjzERLdk05h7+fEbZxWM2taCw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ab464abbeb3a2833288c6e907488c49c2e599f88",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix"
}
},

7
flake.nix
View file

@ -6,7 +6,6 @@
# https://nixos.org/manual/nixos/stable/#sec-upgrading
# https://github.com/NixOS/nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05-small";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
# Add nixos-generators as an input.
# 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
system = "x86_64-linux";
pkgs-unstable = nixpkgs-unstable.legacyPackages."x86_64-linux";
in
{
overlays = {
@ -204,9 +202,6 @@
self.nixosModules.prometheus-exporter
./config/hosts/woodpecker
];
specialArgs = {
inherit pkgs-unstable;
};
};
status = nixpkgs.lib.nixosSystem {