From 8573a533941fc1d17ca46aa24b17f9467497cc39 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 22 May 2024 20:22:07 +0200 Subject: [PATCH 1/3] forgejo: 7.0.2 -> 7.0.3 https://codeberg.org/forgejo/forgejo/releases/tag/v7.0.3 https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-3 diff: https://codeberg.org/forgejo/forgejo/compare/v7.0.2...v7.0.3 (cherry picked from commit c9fe76d1f9cd4ace687f9ec420a99b2dbef1378b) --- pkgs/by-name/fo/forgejo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 90c725c74e74..ade722176d0b 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -24,7 +24,7 @@ let pname = "forgejo-frontend"; inherit (forgejo) src version; - npmDepsHash = "sha256-BffoEbIzTU61bw3ECEm5eDHcav4S27MB5jQKsMprkcw="; + npmDepsHash = "sha256-Nu9aOjJpEAuCWWnJfZXy/GayiUDiyc3hOu6Bx7GxfxA="; patches = [ ./package-json-npm-build-frontend.patch @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-YY5dHXWMqlCIPfqsDtHZLHjEdYmrFnh4yc0hfTUESww="; + hash = "sha256-P+HVZmfNA1ao+fQ253tK8A2DNGNPxvdyzCvByQJ0FGA="; }; - vendorHash = "sha256-UcjaMi/4XYLdaJhi2j3UWqHqkpTbZBo6EwNXxdRIKLw="; + vendorHash = "sha256-8qMpnGL5GXJuxOpxh9a1Bcxd7tVweUKwbun8UBxCfQA="; subPackages = [ "." ]; From cc8d3f8be34b06c1e47cd6d6110a161712641457 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 22 May 2024 20:34:49 +0200 Subject: [PATCH 2/3] CODEOWNERS: fix forgejo package path This slipped through the pkgs/by-name move in 3b4dad9b001a2c5cbc4282bb4b842903bbdeac2d. (cherry picked from commit b8d9848dcbedf97f726aa26fd345aabefb9dc8b3) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 47d5d399f198..b91f753015eb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -307,7 +307,7 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag # Forgejo nixos/modules/services/misc/forgejo.nix @bendlas @emilylange -pkgs/applications/version-management/forgejo @bendlas @emilylange +pkgs/by-name/fo/forgejo/package.nix @bendlas @emilylange # Dotnet /pkgs/build-support/dotnet @IvarWithoutBones From 25959fddfeca78b4692bffde6556bb71a66579a4 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 23 May 2024 01:40:17 +0200 Subject: [PATCH 3/3] CODEOWNERS: add adamcstephens to forgejo (cherry picked from commit 8279d13a6282a089f6af7d379bf916cd4d2f1649) --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b91f753015eb..e78e7ab2bdef 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -306,8 +306,8 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag /pkgs/applications/networking/cluster/terraform-providers @zowoq # Forgejo -nixos/modules/services/misc/forgejo.nix @bendlas @emilylange -pkgs/by-name/fo/forgejo/package.nix @bendlas @emilylange +nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange +pkgs/by-name/fo/forgejo/package.nix @adamcstephens @bendlas @emilylange # Dotnet /pkgs/build-support/dotnet @IvarWithoutBones