From 830ae2b830d61900eb61d1bbf0fbb93af8f54fb1 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sat, 17 May 2025 20:19:43 -0500 Subject: [PATCH] rclone: add patch to fix build on x86_64-darwin rclone stopped building on x86_64-darwin after the upgrade to Go 1.24.3 [1]. Backport an upstream commit to fix the build by bumping the purego dependency [2]. [1]: https://hydra.nixos.org/build/296758431/nixlog/2 [2]: https://github.com/rclone/rclone/commit/6644bdba0fc53f2f51b9a21cd201deece2dbc3e7 --- .../networking/sync/rclone/default.nix | 7 ++++- .../sync/rclone/purego-update.patch | 28 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/sync/rclone/purego-update.patch diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 96cc4f505031..f6c9158d42a8 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -31,7 +31,12 @@ buildGoModule rec { hash = "sha256-WhviYa9H3FsYRgnUhheP6dRj9A9l2nrGeFAhUj5TCKU="; }; - vendorHash = "sha256-dY67FbRka58duZ4xElQr9uOCEonURhkPOyj3NKhW9gc="; + patches = [ + # TODO: remove after updating to 1.69.3 + ./purego-update.patch + ]; + + vendorHash = "sha256-Wu9d98SIENCkJYoGT/f9KN8vnYYGMN7HxhzqtkOYQ/8="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/sync/rclone/purego-update.patch b/pkgs/applications/networking/sync/rclone/purego-update.patch new file mode 100644 index 000000000000..b936c1c0a07f --- /dev/null +++ b/pkgs/applications/networking/sync/rclone/purego-update.patch @@ -0,0 +1,28 @@ +diff --git a/go.mod b/go.mod +index f4d830b89..af23fc0d9 100644 +--- a/go.mod ++++ b/go.mod +@@ -134,7 +134,7 @@ require ( + github.com/cronokirby/saferith v0.33.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/dustin/go-humanize v1.0.1 // indirect +- github.com/ebitengine/purego v0.8.1 // indirect ++ github.com/ebitengine/purego v0.8.3 // indirect + github.com/emersion/go-message v0.18.0 // indirect + github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 // indirect + github.com/emersion/go-vcard v0.0.0-20230815062825-8fda7d206ec9 // indirect +diff --git a/go.sum b/go.sum +index 06a76c5ef..28b4dddbe 100644 +--- a/go.sum ++++ b/go.sum +@@ -213,8 +213,8 @@ github.com/dsnet/try v0.0.3/go.mod h1:WBM8tRpUmnXXhY1U6/S8dt6UWdHTQ7y8A5YSkRCkq4 + github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= + github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= + github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +-github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE= +-github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= ++github.com/ebitengine/purego v0.8.3 h1:K+0AjQp63JEZTEMZiwsI9g0+hAMNohwUOtY0RPGexmc= ++github.com/ebitengine/purego v0.8.3/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= + github.com/emersion/go-message v0.18.0 h1:7LxAXHRpSeoO/Wom3ZApVZYG7c3d17yCScYce8WiXA8= + github.com/emersion/go-message v0.18.0/go.mod h1:Zi69ACvzaoV/MBnrxfVBPV3xWEuCmC2nEN39oJF4B8A= + github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=