From 11f6058b4f792ad5750ccc0ca7ecad3e63fb5a28 Mon Sep 17 00:00:00 2001 From: Darragh Elliott Date: Fri, 2 May 2025 13:02:19 +0100 Subject: [PATCH] gokapi: apply patch to allow builds with go 1.24 --- pkgs/by-name/go/gokapi/go-1.24.patch | 13 +++++++++++++ pkgs/by-name/go/gokapi/package.nix | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/by-name/go/gokapi/go-1.24.patch diff --git a/pkgs/by-name/go/gokapi/go-1.24.patch b/pkgs/by-name/go/gokapi/go-1.24.patch new file mode 100644 index 000000000000..02df74a7fe63 --- /dev/null +++ b/pkgs/by-name/go/gokapi/go-1.24.patch @@ -0,0 +1,13 @@ +diff --git a/build/go-generate/copyStaticFiles.go b/build/go-generate/copyStaticFiles.go +index 9f8a049..de21bdd 100644 +--- a/build/go-generate/copyStaticFiles.go ++++ b/build/go-generate/copyStaticFiles.go +@@ -10,7 +10,7 @@ import ( + ) + + func main() { +- copyFile(build.Default.GOROOT+"/misc/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js") ++ copyFile(build.Default.GOROOT+"/lib/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js") + copyFile("../../go.mod", "../../build/go.mod") + copyFile("../../openapi.json", "../../internal/webserver/web/static/apidocumentation/openapi.json") + } diff --git a/pkgs/by-name/go/gokapi/package.nix b/pkgs/by-name/go/gokapi/package.nix index 4788ad771657..aa92501900fb 100644 --- a/pkgs/by-name/go/gokapi/package.nix +++ b/pkgs/by-name/go/gokapi/package.nix @@ -20,6 +20,10 @@ buildGoModule rec { vendorHash = "sha256-9GRAlgng+yq7q0VQz374jIOCjeDIIDD631BglM/FsQQ="; + patches = [ + ./go-1.24.patch + ]; + # This is the go generate is ran in the upstream builder, but we have to run the components separately for things to work. preBuild = '' cd ./cmd/gokapi/