diff --git a/pkgs/by-name/go/goshs/package.nix b/pkgs/by-name/go/goshs/package.nix index 83bddf313789..621c928ce919 100644 --- a/pkgs/by-name/go/goshs/package.nix +++ b/pkgs/by-name/go/goshs/package.nix @@ -3,31 +3,21 @@ stdenv, buildGoModule, fetchFromGitHub, - fetchpatch2, versionCheckHook, }: buildGoModule (finalAttrs: { pname = "goshs"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { - owner = "patrickhener"; + owner = "goshs-labs"; repo = "goshs"; tag = "v${finalAttrs.version}"; - hash = "sha256-8xSYdLO+2AB044sV3JJw0RXB0RuLQ7eIzWvwgoJdp5k="; + hash = "sha256-mVgBY1QhQ+tDQnfangqylNeCbBJTSJaM0y7vZ95BU3Y="; }; - vendorHash = "sha256-yKNJHs6A7Du9NvGOpwaDmABz6SBMPVzJNoQb7W32IfA="; - - patches = [ - # Remove when updating to 2.1.5 or later. - (fetchpatch2 { - name = "CVE-2026-66063+CVE-2026-66064.patch"; - url = "https://github.com/goshs-labs/goshs/commit/f3ef599e409151d1380866e47de8b1afb0bb54fa.patch?full_index=1"; - hash = "sha256-fIKeqWKraaLcocp7aaWE58ffkA1/2NVwR7KMmJfXL5g="; - }) - ]; + vendorHash = "sha256-lwZ+F/DaP5pYiaihMxFAo1DokKm6itreX7yG1CNCdWM="; ldflags = [ "-s" ]; @@ -53,7 +43,7 @@ buildGoModule (finalAttrs: { meta = { description = "Simple, yet feature-rich web server written in Go"; homepage = "https://goshs.de"; - changelog = "https://github.com/patrickhener/goshs/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/goshs-labs/goshs/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab