forgejo-actions-run.: use runner pkg from unstable to make it work again
This commit is contained in:
parent
275a3779f7
commit
550b0f13ca
3 changed files with 27 additions and 4 deletions
|
|
@ -3,11 +3,11 @@
|
||||||
# - https://forgejo.org/docs/latest/user/actions/
|
# - https://forgejo.org/docs/latest/user/actions/
|
||||||
# - https://docs.gitea.com/next/usage/actions/act-runner
|
# - https://docs.gitea.com/next/usage/actions/act-runner
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs-unstable, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.gitea-actions-runner = {
|
services.gitea-actions-runner = {
|
||||||
package = pkgs.forgejo-actions-runner;
|
package = pkgs-unstable.forgejo-actions-runner;
|
||||||
instances.ccchh-forgejo-global-docker = {
|
instances.ccchh-forgejo-global-docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "Global Docker Forgejo Actions Runner";
|
name = "Global Docker Forgejo Actions Runner";
|
||||||
|
|
|
||||||
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -67,6 +67,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1760965567,
|
||||||
|
"narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759580034,
|
"lastModified": 1759580034,
|
||||||
|
|
@ -88,6 +104,7 @@
|
||||||
"authorizedKeysRepo": "authorizedKeysRepo",
|
"authorizedKeysRepo": "authorizedKeysRepo",
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
10
flake.nix
10
flake.nix
|
|
@ -6,6 +6,7 @@
|
||||||
# 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-25.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||||
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
|
|
||||||
# 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
|
||||||
|
|
@ -27,12 +28,13 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixos-generators, sops-nix, authorizedKeysRepo, ... }:
|
outputs = { self, nixpkgs, nixos-generators, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }:
|
||||||
let
|
let
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit authorizedKeysRepo;
|
inherit authorizedKeysRepo;
|
||||||
};
|
};
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
pkgs-unstable = nixpkgs-unstable.legacyPackages."${system}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosModules = {
|
nixosModules = {
|
||||||
|
|
@ -135,7 +137,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
forgejo-actions-runner = nixpkgs.lib.nixosSystem {
|
forgejo-actions-runner = nixpkgs.lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
self.nixosModules.common
|
self.nixosModules.common
|
||||||
self.nixosModules.proxmox-vm
|
self.nixosModules.proxmox-vm
|
||||||
|
|
@ -143,6 +145,10 @@
|
||||||
self.nixosModules.prometheus-exporter
|
self.nixosModules.prometheus-exporter
|
||||||
./config/hosts/forgejo-actions-runner
|
./config/hosts/forgejo-actions-runner
|
||||||
];
|
];
|
||||||
|
specialArgs = {
|
||||||
|
inherit authorizedKeysRepo;
|
||||||
|
inherit pkgs-unstable;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
ptouch-print-server = nixpkgs.lib.nixosSystem {
|
ptouch-print-server = nixpkgs.lib.nixosSystem {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue