From 22737c1f79d1840cf1c8da3d02fe922b1ca607a6 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Wed, 13 May 2026 20:37:11 +0000 Subject: [PATCH 1/6] seaweedfs: 4.19 -> 4.24 (cherry picked from commit 484dbb043aae00b076f1ce45c756ad4b8d9d9507) --- pkgs/by-name/se/seaweedfs/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index dd015233d990..df8ae59e1a78 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -5,13 +5,14 @@ installShellFiles, lib, libredirect, + glibc, nix-update-script, stdenv, versionCheckHook, }: buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "4.19"; + version = "4.24"; src = fetchFromGitHub { owner = "seaweedfs"; @@ -24,7 +25,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-xMfV3WE10iP8MqxYd5w8JRUL5O7vO6ATN1ZEHB8MRxg="; + hash = "sha256-PYVCoeO+EYZ87gNwd9r+wgkpoeLhKKmV8fOimKkqR6w"; }; postPatch = '' @@ -32,7 +33,11 @@ buildGoModule (finalAttrs: { rm -rf unmaintained ''; - vendorHash = "sha256-mGiA91y6ebbbdAu0+ZDylUDuZb8vcNaqeGv70/IFx9k="; + vendorHash = "sha256-lTCfs/4FrICgb+uESM3XZBdinQw9Z0GrHkCIwmKSRh8"; + + buildInputs = [ + glibc.static + ]; nativeBuildInputs = [ installShellFiles @@ -64,6 +69,7 @@ buildGoModule (finalAttrs: { }; preBuild = '' + export NIX_CFLAGS_LINK="-L${glibc.static}/lib" ldflags+=" -X \"github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$( Date: Fri, 5 Jun 2026 14:24:11 +0300 Subject: [PATCH 2/6] seaweedfs: 4.24 -> 4.31 https://github.com/seaweedfs/seaweedfs/releases/tag/4.31 https://github.com/seaweedfs/seaweedfs/compare/4.24...4.31 Disabled tests because keeping them compatible with sandboxing is too much of a hassle. (cherry picked from commit 790a6d3e10b60cf500ca2da352c6794ccd3fce22) --- pkgs/by-name/se/seaweedfs/package.nix | 54 +++++---------------------- 1 file changed, 9 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index df8ae59e1a78..927632d2748b 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -1,18 +1,15 @@ { buildGoModule, fetchFromGitHub, - iana-etc, installShellFiles, lib, - libredirect, - glibc, nix-update-script, stdenv, versionCheckHook, }: buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "4.24"; + version = "4.31"; src = fetchFromGitHub { owner = "seaweedfs"; @@ -25,26 +22,12 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-PYVCoeO+EYZ87gNwd9r+wgkpoeLhKKmV8fOimKkqR6w"; + hash = "sha256-jhhLOjA+CXhtNyVHePT7dN3T5u5K3dHJj1gmxOh+RJU="; }; - postPatch = '' - # Remove unmaintained code that's not used and generates various issues. - rm -rf unmaintained - ''; + vendorHash = "sha256-eB5fkFDGOqw4q2iHe4acLfIx2/a1Ys1EmARGX/vIN84="; - vendorHash = "sha256-lTCfs/4FrICgb+uESM3XZBdinQw9Z0GrHkCIwmKSRh8"; - - buildInputs = [ - glibc.static - ]; - - nativeBuildInputs = [ - installShellFiles - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libredirect.hook - ]; + nativeBuildInputs = [ installShellFiles ]; subPackages = [ "weed" ]; @@ -69,31 +52,14 @@ buildGoModule (finalAttrs: { }; preBuild = '' - export NIX_CFLAGS_LINK="-L${glibc.static}/lib" ldflags+=" -X \"github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$( Date: Fri, 5 Jun 2026 15:05:34 +0300 Subject: [PATCH 3/6] seaweedfs: mark broken on darwin (cherry picked from commit 47abd35dc166252f93762c4443513e461609ae24) --- pkgs/by-name/se/seaweedfs/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index 927632d2748b..ee8bc2b23fd5 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -93,5 +93,6 @@ buildGoModule (finalAttrs: { wozeparrot ]; mainProgram = "weed"; + broken = stdenv.hostPlatform.isDarwin; }; }) From 2918595b88afb19f779eb3f26b5feeedc00861f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jun 2026 01:41:08 +0000 Subject: [PATCH 4/6] seaweedfs: 4.31 -> 4.34 (cherry picked from commit 82eeb1316d27f1188a36ce1366c88e49eb7596f4) --- pkgs/by-name/se/seaweedfs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index ee8bc2b23fd5..86a1e9121b4e 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -9,7 +9,7 @@ }: buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "4.31"; + version = "4.34"; src = fetchFromGitHub { owner = "seaweedfs"; @@ -22,10 +22,10 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-jhhLOjA+CXhtNyVHePT7dN3T5u5K3dHJj1gmxOh+RJU="; + hash = "sha256-lKpNBdiynDEnqCujgDRFUXvyVops4Q5l6n9P/7pm8hc="; }; - vendorHash = "sha256-eB5fkFDGOqw4q2iHe4acLfIx2/a1Ys1EmARGX/vIN84="; + vendorHash = "sha256-MF8aLFKUFq0io7CL1EGZp+TUB2co/Hf0fwK2wZybx8Y="; nativeBuildInputs = [ installShellFiles ]; From a9153b4eb15a2e32ec0defe4a9006569c49fcb11 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 24 Jun 2026 20:57:57 +1000 Subject: [PATCH 5/6] seaweedfs: fix build on Darwin (cherry picked from commit 23cbb6daa6e96467f3c357f301225e72bb7abffe) --- pkgs/by-name/se/seaweedfs/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index 86a1e9121b4e..e64d55b6cef6 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -43,11 +43,13 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-extldflags=-static" ]; env = { - CGO_ENABLED = 0; + CGO_ENABLED = if stdenv.hostPlatform.isDarwin then 1 else 0; GODEBUG = "http2client=0"; }; @@ -93,6 +95,5 @@ buildGoModule (finalAttrs: { wozeparrot ]; mainProgram = "weed"; - broken = stdenv.hostPlatform.isDarwin; }; }) From f458e08ea26875f4e99f30cfe2ee0439805b8d72 Mon Sep 17 00:00:00 2001 From: azahi Date: Fri, 26 Jun 2026 15:06:08 +0300 Subject: [PATCH 6/6] seaweedfs: 4.34 -> 4.36 (cherry picked from commit 446b715ee13de4babc601d8f38150891b46c68a7) --- pkgs/by-name/se/seaweedfs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index e64d55b6cef6..4e75bec00cf5 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -9,7 +9,7 @@ }: buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "4.34"; + version = "4.36"; src = fetchFromGitHub { owner = "seaweedfs"; @@ -22,10 +22,10 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-lKpNBdiynDEnqCujgDRFUXvyVops4Q5l6n9P/7pm8hc="; + hash = "sha256-y42opbGNVMxWU/k0j5g27RWLBF0PLcOPlXU9eVg0jwY="; }; - vendorHash = "sha256-MF8aLFKUFq0io7CL1EGZp+TUB2co/Hf0fwK2wZybx8Y="; + vendorHash = "sha256-peRhKuZ1D+y8Uhw1+P8Ogc1HrOh1/kYVd29lR89+rIo="; nativeBuildInputs = [ installShellFiles ];