From 7d38c0c6972518f0b74a66ac8097d6c56ab6b3e4 Mon Sep 17 00:00:00 2001 From: Vri Date: Thu, 4 Jul 2024 12:03:59 +0200 Subject: [PATCH 1/2] forgejo: remove no longer required patch Credits to @emilylange :) --- pkgs/by-name/fo/forgejo/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index d084deca1f44..c12e105c1cb3 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -65,12 +65,6 @@ buildGoModule rec { patches = [ ./static-root-path.patch - # Fix TestAddRecursiveExclude go test. - # This will be part of the upcoming v7.0.5 release at which point this needs to be removed again. - (fetchpatch { - url = "https://codeberg.org/forgejo/forgejo/commit/f01dc4b271f54201e60a7c795d784813eac3f7ce.patch"; - sha256 = "sha256-1lPLVHBad+Fmk+6EFXKuMnmDUl5BkEYJuMkTPfdrCgU="; - }) ]; postPatch = '' From d1c43d9b679e1e60ae0a4ed4221e98f5bb5ecf36 Mon Sep 17 00:00:00 2001 From: Vri Date: Thu, 4 Jul 2024 12:11:11 +0200 Subject: [PATCH 2/2] forgejo: 7.0.4 -> 7.0.5 --- pkgs/by-name/fo/forgejo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index c12e105c1cb3..c98957268aa0 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -40,17 +40,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-WtJJdqPbx5k9U+u3ZpI3q/dm3eidxdkFgc8IskaJg88="; + hash = "sha256-Y/Ita5dr3COACffAIAjcqHHcdKiUWWEb/f/MPzMG200="; }; - vendorHash = "sha256-TYVWou9fIVL4od2o1uOb/MRBpf2lIg/9Tem9w+ihYzU="; + vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw="; subPackages = [ "." "contrib/environment-to-ini" ];