summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremilylange <git@emilylange.de>2024-04-19 00:11:41 +0200
committeremilylange <git@emilylange.de>2024-04-19 00:11:41 +0200
commitb9a5007e5ddbf7b92b895dd02e3c5243b65c5d90 (patch)
treedf09a8d23b0548eae385a3a3416fc66b4f4ac55e
parentMerge pull request #305021 from NixOS/backport-303383-to-release-23.11 (diff)
downloadnixpkgs-b9a5007e5ddbf7b92b895dd02e3c5243b65c5d90.tar.gz
forgejo: 1.20.6-1-unstable-2024-02-22 -> 1.20.6-1-unstable-2024-04-18
This bump backports 1.21.11-0's security fixes to 1.20.6-1. https://codeberg.org/forgejo/forgejo/pulls/3319 Please refer to the "Security fix" section in 1.21.11-0's release notes: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-11-0
-rw-r--r--pkgs/applications/version-management/forgejo/default.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix
index 25b129e20846..40f95f171dc4 100644
--- a/pkgs/applications/version-management/forgejo/default.nix
+++ b/pkgs/applications/version-management/forgejo/default.nix
@@ -39,18 +39,22 @@ let
in
buildGoModule rec {
pname = "forgejo";
- version = "1.20.6-1-unstable-2024-02-22";
+ version = "1.20.6-1-unstable-2024-04-18";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "forgejo";
repo = "forgejo";
- # latest commit from 1.20.x branch (2024-02-22) with 1.21.6-0's XSS fix backported.
+ # latest commit from 1.20.x branch (2024-04-18) with 1.21.6-0's and
+ # 1.21.11-0's security fixes backported.
# coordinated with upstream in #forgejo-development:matrix.org :)
+ # https://codeberg.org/forgejo/forgejo/src/branch/v1.20/forgejo
# https://codeberg.org/forgejo/forgejo/pulls/2443
# https://codeberg.org/forgejo/forgejo/commit/2fe5f6f73283c2f6935ded62440a1f15ded12dcd
- rev = "2fe5f6f73283c2f6935ded62440a1f15ded12dcd";
- hash = "sha256-U80HfHDSOKN+MGOX9Tu85lgN+8KeEzjSjpZXVFGmLKQ=";
+ # https://codeberg.org/forgejo/forgejo/pulls/3319
+ # https://codeberg.org/forgejo/forgejo/commit/0c4a307ee2aeaaf464ed74521b1fdb12114fde60
+ rev = "0c4a307ee2aeaaf464ed74521b1fdb12114fde60";
+ hash = "sha256-S2aRSXJybrjgpN16/1vbV1CUoMc1IvUGBO2DXB1CTYE=";
# Forgejo has multiple different version strings that need to be provided
# via ldflags. main.ForgejoVersion for example is a combination of a
# hardcoded gitea compatibility version string (in the Makefile) and
@@ -69,7 +73,7 @@ buildGoModule rec {
'';
};
- vendorHash = "sha256-HDKirjQI4KvHvzDCqKe9nHvQUv3VNRl5tkr0rO7gcAY=";
+ vendorHash = "sha256-ao2CY6LmiDQIgv/i8okWt+xGa+clHzbCEHYFUrlwox0=";
subPackages = [ "." ];