From 02e18aa0fccadba78ca0442148505b1ed8d91b6c Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 3 Dec 2025 21:49:18 +0000 Subject: [PATCH] use latest forgejo --- hosts/h001/containers/forgejo.nix | 6 +++++- hosts/h001/flake.lock | 17 +++++++++++++++++ hosts/h001/flake.nix | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/hosts/h001/containers/forgejo.nix b/hosts/h001/containers/forgejo.nix index 672721ad..bf180dfb 100644 --- a/hosts/h001/containers/forgejo.nix +++ b/hosts/h001/containers/forgejo.nix @@ -1,6 +1,7 @@ { config, lib, + inputs, ... }: let @@ -13,6 +14,8 @@ let hostAddress6 = "fc00::1"; containerAddress6 = "fc00::2"; + forgejoNixpkgs = inputs.forgejo-nixpkgs; + binds = [ # Postgres data, must use postgres user in container and host { @@ -119,6 +122,7 @@ in } // acc ) { } binds; + nixpkgs = forgejoNixpkgs; config = { config, pkgs, ... }: { @@ -208,7 +212,7 @@ in SHOW_FOOTER_TEMPLATE_LOAD_TIME = false; }; migrations = { - ALLOWED_DOMAINS = "*.github.com,github.com"; + ALLOWED_DOMAINS = "*.github.com,github.com,codeberg.org,*.codeberg.org"; ALLOW_LOCALNETWORKS = true; }; }; diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index 0f0ad6fc..5e5ad03f 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -151,6 +151,22 @@ "type": "github" } }, + "forgejo-nixpkgs": { + "locked": { + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "418468ac9527e799809c900eda37cbff999199b6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs" @@ -1247,6 +1263,7 @@ "beszel": "beszel", "beszel-nixpkgs": "beszel-nixpkgs_2", "common": "common", + "forgejo-nixpkgs": "forgejo-nixpkgs", "home-manager": "home-manager", "litellm-nixpkgs": "litellm-nixpkgs", "nixarr": "nixarr", diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix index 2efc7698..ef4508be 100644 --- a/hosts/h001/flake.nix +++ b/hosts/h001/flake.nix @@ -11,6 +11,7 @@ pinchflat-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; zitadel-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; beszel-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + forgejo-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing # common.url = "path:../../flakes/common";