From cb9bd5e787c72550cc0a6aac683f9a1c20e07031 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Fri, 21 Mar 2025 09:15:29 -0400 Subject: [PATCH 1/2] forgejo: 10.0.1 -> 10.0.2 Changelog: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/10.0.2.md --- 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 bfc56b506978..23f9dcd54ef8 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 = "10.0.1"; - hash = "sha256-JLy/edAkbsOqQTQqqoyxc0UX9fPnP8HD54IUzcsyGe4="; + version = "10.0.2"; + hash = "sha256-UxjhJA6o1LS/7/s0BzcaTSkXSsnKfjIMIjL6ASSot6k="; npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw="; - vendorHash = "sha256-fqHwqpIetX2jTAWAonRWqF1tArL7Ik/XXURY51jGOn0="; + vendorHash = "sha256-ceV73QmxYEthjsA50ylojwC4dcTYAbE2UgxuxFqvi24="; lts = false; nixUpdateExtraArgs = [ "--override-filename" From e4b383b2a6c0b04e77e1c5062b4b96f4cecc19ec Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Fri, 21 Mar 2025 10:49:47 -0400 Subject: [PATCH 2/2] forgejo: remove SSH DSA test skips Tests are no longer valid now that https://codeberg.org/forgejo/forgejo/pulls/4833 is merged into 10.x and backported to 7.x --- pkgs/by-name/fo/forgejo/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 2a851e523d54..4e475c733c22 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -119,12 +119,11 @@ buildGoModule rec { checkFlags = let skippedTests = [ - "Test_SSHParsePublicKey/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time - "Test_calcFingerprint/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time "TestPassword" # requires network: api.pwnedpasswords.com "TestCaptcha" # requires network: hcaptcha.com "TestDNSUpdate" # requires network: release.forgejo.org "TestMigrateWhiteBlocklist" # requires network: gitlab.com (DNS) + "TestURLAllowedSSH/Pushmirror_URL" # requires network git.gay (DNS) ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];