From e1a60202156a760444347f514926388a8814dd5f Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Sun, 6 Oct 2024 14:38:52 +0200
Subject: [PATCH 1/2] forgejo: add marie to maintainers

---
 pkgs/by-name/fo/forgejo/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix
index 8ca9a12e96ac6..03cd780b864d7 100644
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -157,7 +157,7 @@ buildGoModule rec {
     homepage = "https://forgejo.org";
     changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens ];
+    maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens marie ];
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "gitea";
   };

From ec4f809cd5c718b9334459d32e940e02a3cdb9c8 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Sun, 6 Oct 2024 14:20:23 +0200
Subject: [PATCH 2/2] forgejo: 8.0.3 -> 9.0.0

Forgejo v9 is now licensed under GPL-3.0-or-later.
Release notes: https://codeberg.org/forgejo/forgejo/milestone/7235
---
 nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++
 pkgs/by-name/fo/forgejo/generic.nix               | 6 +++---
 pkgs/by-name/fo/forgejo/package.nix               | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 3815475f9f709..39bd3065d63d9 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -339,10 +339,13 @@
 - `nodePackages.coc-python` was dropped, as [its upstream is unmaintained](https://github.com/neoclide/coc-python). The associated `vimPlugins.coc-python` was also dropped.
   The upstream project recommends using `coc-pyright` or `coc-jedi` as replacements.
 
+- `forgejo` has been upgraded from version 7.0 to version 9.0, see the release notes for [8.0](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#8-0-0) and [9.0](https://codeberg.org/forgejo/forgejo/milestone/7235).
+
 - `services.forgejo.mailerPasswordFile` has been deprecated by the drop-in replacement `services.forgejo.secrets.mailer.PASSWD`,
   which is part of the new free-form `services.forgejo.secrets` option.
   `services.forgejo.secrets` is a small wrapper over systemd's `LoadCredential=`. It has the same structure (sections/keys) as
   `services.forgejo.settings` but takes file paths that will be read before service startup instead of some plaintext value.
+  `services.forgejo.package` now defaults to `forgejo-lts`, the Long Term Support version of Forgejo.
 
 - `forgejo` and `forgejo-lts` no longer support the opt-in feature [PAM (Pluggable Authentication Module)](https://forgejo.org/docs/latest/user/authentication/#pam-pluggable-authentication-module).
 
diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix
index 03cd780b864d7..daef0e418e490 100644
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -1,5 +1,6 @@
 { lts ? false
 , version
+, rev ? "refs/tags/v${version}"
 , hash
 , npmDepsHash
 , vendorHash
@@ -30,8 +31,7 @@ let
     domain = "codeberg.org";
     owner = "forgejo";
     repo = "forgejo";
-    rev = "v${version}";
-    inherit hash;
+    inherit rev hash;
   };
 
   frontend = buildNpmPackage {
@@ -156,7 +156,7 @@ buildGoModule rec {
     description = "Self-hosted lightweight software forge";
     homepage = "https://forgejo.org";
     changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}";
-    license = lib.licenses.mit;
+    license = if lib.versionAtLeast version "9.0.0" then lib.licenses.gpl3Plus else lib.licenses.mit;
     maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens marie ];
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "gitea";
diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 6632a8a36522c..67f96257b4817 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "8.0.3";
-  hash = "sha256-PvCWUiJIs9ktuJetPYZT0V8S8+OYahCDZiZQpvWWXhY=";
-  npmDepsHash = "sha256-E4eq4OompY8e+722PbSFCmcarpYBpO/n9X6GVU9AhDU=";
-  vendorHash = "sha256-4l4kscwesW/cR8mZjE3G9HcVm0d1ukxbtBY6RXYRi8k=";
+  version = "9.0.0";
+  hash = "sha256-GzkuJ2aJ7I4/xDLLIrwcgXuInXoXzMWvQ7Z1mdGaOPw=";
+  npmDepsHash = "sha256-UFUNOR+ks3hDmT7uVEToX+rMmlFL6gQqigAxl6RP37Q=";
+  vendorHash = "sha256-j3BY6fEXCL82TDna80vjL25FDFLUhyMtmQW8d6GLQdk=";
   lts = false;
   nixUpdateExtraArgs = [
     "--override-filename"