diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index ac1c66aca115..52a9b1f73252 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -9,42 +9,54 @@
   swift,
   swiftpm,
   replaceVars,
+  gitMinimal,
+  versionCheckHook,
+  nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sentry-cli";
-  version = "2.58.0";
+  version = "2.58.2";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
-    rev = version;
-    hash = "sha256-8fz8bSQxqylTQ7mD/QbQ6gc8qlEdx/SDCjaB3uqFnGA=";
+    tag = finalAttrs.version;
+    hash = "sha256-2dxnAwxIdmeA53PETUyDUgi1T4ZH9faBvPCMdRPUDxw=";
   };
-  doCheck = false;
 
-  # Needed to get openssl-sys to use pkgconfig.
-  OPENSSL_NO_VENDOR = 1;
-
-  patches = [
-    (replaceVars ./fix-swift-lib-path.patch {
-      swiftLib = lib.getLib swift;
-    })
+  patches = lib.optionals stdenv.hostPlatform.isDarwin [
+    (replaceVars ./fix-swift-lib-path.patch { swiftLib = lib.getLib swift; })
   ];
 
-  buildInputs = [ openssl ];
+  cargoHash = "sha256-CwULTOZN2TTpB8heLuegID38ub6J3XoiY7l7UW1VcGo=";
+
+  # Needed to get openssl-sys to use pkgconfig.
+  env.OPENSSL_NO_VENDOR = 1;
+
+  # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase`
+  dontUseSwiftpmBuild = true;
+  dontUseSwiftpmCheck = true;
+
+  __darwinAllowLocalNetworking = true;
+
   nativeBuildInputs = [
     installShellFiles
     pkg-config
   ]
-  ++ (lib.optionals stdenv.hostPlatform.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     swift
     swiftpm
-  ]);
+  ];
 
-  # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase`
-  dontUseSwiftpmBuild = true;
+  buildInputs = [ openssl ];
 
-  cargoHash = "sha256-3I0uKHpD4SpSeLSIAEjBxxAFfyS4WIvb76x7QAy53HM=";
+  nativeCheckInputs = [ gitMinimal ];
+
+  checkFlags = [
+    "--skip=integration::send_metric::command_send_metric"
+    "--skip=integration::update::command_update"
+  ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd sentry-cli \
@@ -53,12 +65,18 @@ rustPlatform.buildRustPackage rec {
         --zsh <($out/bin/sentry-cli completions zsh)
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://docs.sentry.io/cli/";
     license = lib.licenses.bsd3;
     description = "Command line utility to work with Sentry";
     mainProgram = "sentry-cli";
-    changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md";
+    changelog = "https://github.com/getsentry/sentry-cli/raw/${finalAttrs.version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ rizary ];
   };
-}
+})