From 05859772ecafed33ea224022d40fcb629bb8189c Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 20 May 2025 02:18:30 +0200 Subject: [PATCH 1/2] glance: fix build on x86_64-darwin --- pkgs/by-name/gl/glance/package.nix | 4 +++- pkgs/by-name/gl/glance/update_purego.patch | 26 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/gl/glance/update_purego.patch diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index ed0a3386dfee..f0ee91131fd5 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -18,7 +18,9 @@ buildGoModule (finalAttrs: { hash = "sha256-syWalphoKjUYrQjKrQUMDijgILQ+AIOVTMqYCiYVWyU="; }; - vendorHash = "sha256-81FAWMe7ksmbklXGGg15v2W4nuT6AcBHLIhXF7bI78c="; + patches = [ ./update_purego.patch ]; + + vendorHash = "sha256-esPtCg63A40mX9hADOhEa+NjNk+9MI/0qZG3uE91qxg="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glance/update_purego.patch b/pkgs/by-name/gl/glance/update_purego.patch new file mode 100644 index 000000000000..b91fa89f2de4 --- /dev/null +++ b/pkgs/by-name/gl/glance/update_purego.patch @@ -0,0 +1,26 @@ +diff --git a/go.mod b/go.mod +index ccea58ca68..118d91c650 100644 +--- a/go.mod ++++ b/go.mod +@@ -15,7 +15,7 @@ + require ( + github.com/PuerkitoBio/goquery v1.10.3 // indirect + github.com/andybalholm/cascadia v1.3.3 // indirect +- github.com/ebitengine/purego v0.8.2 // indirect ++ github.com/ebitengine/purego v0.8.3 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect +diff --git a/go.sum b/go.sum +index 80c2d6c664..6236b4de85 100644 +--- a/go.sum ++++ b/go.sum +@@ -11,6 +11,8 @@ + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I= + github.com/ebitengine/purego v0.8.2/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/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= + github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= + github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= From f519f7581cb093e24ab06fec6d9eaffe74c1c65c Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 20 May 2025 02:18:30 +0200 Subject: [PATCH 2/2] glance: 0.8.1 -> 0.8.3 --- pkgs/by-name/gl/glance/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index f0ee91131fd5..e6e96550ff72 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "glance"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; tag = "v${finalAttrs.version}"; - hash = "sha256-syWalphoKjUYrQjKrQUMDijgILQ+AIOVTMqYCiYVWyU="; + hash = "sha256-o2Yom40HbNKe3DMMxz0Mf2gG8zresgU52Odpj2H7ZPU="; }; patches = [ ./update_purego.patch ];