From 550b0f13cab53e3dac2ea5f210baae9fadab023c Mon Sep 17 00:00:00 2001 From: June Date: Fri, 24 Oct 2025 19:09:16 +0200 Subject: [PATCH] forgejo-actions-run.: use runner pkg from unstable to make it work again --- .../forgejo-actions-runner.nix | 4 ++-- flake.lock | 17 +++++++++++++++++ flake.nix | 10 ++++++++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/config/hosts/forgejo-actions-runner/forgejo-actions-runner.nix b/config/hosts/forgejo-actions-runner/forgejo-actions-runner.nix index 4b4d4dc..df8bef5 100644 --- a/config/hosts/forgejo-actions-runner/forgejo-actions-runner.nix +++ b/config/hosts/forgejo-actions-runner/forgejo-actions-runner.nix @@ -3,11 +3,11 @@ # - https://forgejo.org/docs/latest/user/actions/ # - https://docs.gitea.com/next/usage/actions/act-runner -{ config, pkgs, ... }: +{ config, pkgs-unstable, ... }: { services.gitea-actions-runner = { - package = pkgs.forgejo-actions-runner; + package = pkgs-unstable.forgejo-actions-runner; instances.ccchh-forgejo-global-docker = { enable = true; name = "Global Docker Forgejo Actions Runner"; diff --git a/flake.lock b/flake.lock index 1634fee..2bc90d5 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,22 @@ "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": { "locked": { "lastModified": 1759580034, @@ -88,6 +104,7 @@ "authorizedKeysRepo": "authorizedKeysRepo", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_2", + "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, diff --git a/flake.nix b/flake.nix index e458964..3901c78 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ # https://nixos.org/manual/nixos/stable/#sec-upgrading # https://github.com/NixOS/nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # Add nixos-generators as an input. # 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 specialArgs = { inherit authorizedKeysRepo; }; system = "x86_64-linux"; + pkgs-unstable = nixpkgs-unstable.legacyPackages."${system}"; in { nixosModules = { @@ -135,7 +137,7 @@ }; forgejo-actions-runner = nixpkgs.lib.nixosSystem { - inherit system specialArgs; + inherit system; modules = [ self.nixosModules.common self.nixosModules.proxmox-vm @@ -143,6 +145,10 @@ self.nixosModules.prometheus-exporter ./config/hosts/forgejo-actions-runner ]; + specialArgs = { + inherit authorizedKeysRepo; + inherit pkgs-unstable; + }; }; ptouch-print-server = nixpkgs.lib.nixosSystem {