From 7b95577686f5a06cefb9da191347ee09bcbd4ef9 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Sun, 6 Oct 2024 14:20:23 +0200 Subject: [PATCH] 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 | 2 ++ pkgs/by-name/fo/forgejo/generic.nix | 10 +++++----- pkgs/by-name/fo/forgejo/package.nix | 9 +++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index d4b1adde52fa8..f0dc87c8fbdda 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -42,6 +42,8 @@ Users can use it by `services.displayManager.ly.enable` and config it by `services.displayManager.ly.settings` to generate `/etc/ly/config.ini` +- `forgejo` has been upgraded to version 9.0, see the [release notes](https://codeberg.org/forgejo/forgejo/milestone/7235). + - The default sound server for most graphical sessions has been switched from PulseAudio to PipeWire. Users that want to keep PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`. There is currently no plan to fully deprecate and remove PulseAudio, however, PipeWire should generally be preferred for new installs. diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 03cd780b864d7..0f6fb7302f880 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 @@ -8,7 +9,7 @@ { bash , brotli -, buildGoModule +, buildGo123Module , forgejo , git , gzip @@ -30,8 +31,7 @@ let domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; - rev = "v${version}"; - inherit hash; + inherit rev hash; }; frontend = buildNpmPackage { @@ -49,7 +49,7 @@ let ''; }; in -buildGoModule rec { +buildGo123Module rec { pname = "forgejo" + lib.optionalString lts "-lts"; inherit @@ -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..b23444e219cfb 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,9 @@ import ./generic.nix { - version = "8.0.3"; - hash = "sha256-PvCWUiJIs9ktuJetPYZT0V8S8+OYahCDZiZQpvWWXhY="; - npmDepsHash = "sha256-E4eq4OompY8e+722PbSFCmcarpYBpO/n9X6GVU9AhDU="; - vendorHash = "sha256-4l4kscwesW/cR8mZjE3G9HcVm0d1ukxbtBY6RXYRi8k="; + version = "9.0.0"; + rev = "0ae05e1000d2dd8354b932fcc19c8eda23647da6"; + hash = "sha256-BXVPB8DXkMkKv/5CFZsxx7xjBvA62Oogk+zC5brjXGY="; + npmDepsHash = "sha256-UFUNOR+ks3hDmT7uVEToX+rMmlFL6gQqigAxl6RP37Q="; + vendorHash = "sha256-j3BY6fEXCL82TDna80vjL25FDFLUhyMtmQW8d6GLQdk="; lts = false; nixUpdateExtraArgs = [ "--override-filename"