diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index dd015233d990..4e75bec00cf5 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -1,17 +1,15 @@ { buildGoModule, fetchFromGitHub, - iana-etc, installShellFiles, lib, - libredirect, nix-update-script, stdenv, versionCheckHook, }: buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "4.19"; + version = "4.36"; src = fetchFromGitHub { owner = "seaweedfs"; @@ -24,22 +22,12 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-xMfV3WE10iP8MqxYd5w8JRUL5O7vO6ATN1ZEHB8MRxg="; + hash = "sha256-y42opbGNVMxWU/k0j5g27RWLBF0PLcOPlXU9eVg0jwY="; }; - postPatch = '' - # Remove unmaintained code that's not used and generates various issues. - rm -rf unmaintained - ''; + vendorHash = "sha256-peRhKuZ1D+y8Uhw1+P8Ogc1HrOh1/kYVd29lR89+rIo="; - vendorHash = "sha256-mGiA91y6ebbbdAu0+ZDylUDuZb8vcNaqeGv70/IFx9k="; - - nativeBuildInputs = [ - installShellFiles - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libredirect.hook - ]; + nativeBuildInputs = [ installShellFiles ]; subPackages = [ "weed" ]; @@ -55,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"; }; @@ -67,26 +57,11 @@ buildGoModule (finalAttrs: { ldflags+=" -X \"github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$(