From 78326f48866e57dcc6fbf64cbb0e5916d532ea63 Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Mon, 11 Nov 2024 09:02:55 +0000
Subject: [PATCH] py-spy: 0.3.14-unstable-2024-02-27 -> 0.4.0

---
 pkgs/development/tools/py-spy/default.nix | 20 ++++++--------------
 pkgs/top-level/all-packages.nix           |  5 +----
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix
index 01d847649bbf86..8213ce87bec2cb 100644
--- a/pkgs/development/tools/py-spy/default.nix
+++ b/pkgs/development/tools/py-spy/default.nix
@@ -9,21 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "py-spy";
-  version = "0.3.14-unstable-2024-02-27";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "benfred";
     repo = "py-spy";
-    rev = "8dd54929106916a3c961cc57c1172793ce126180";
-    hash = "sha256-rrngOqlXIJXbh3A7OBEcgoakZyyuvlHHXhWo3/1BRpY=";
+    rev = "v${version}";
+    hash = "sha256-T96F8xgB9HRwuvDLXi6+lfi8za/iNn1NAbG4AIpE0V0=";
   };
 
-  cargoHash = "sha256-gNnuuq2cz168Gaw+gL2nJ8EC32BMPu9DgnRzIh1hGKk=";
-
-  # error: linker `arm-linux-gnueabihf-gcc` not found
-  postPatch = ''
-    rm .cargo/config
-  '';
+  cargoHash = "sha256-SkHlXvhmw7swjZDdat0z0o5ATDJ1qSE/iwiwywsFOyw=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
@@ -41,11 +36,8 @@ rustPlatform.buildRustPackage rec {
   env.NIX_CFLAGS_COMPILE = "-L${libunwind}/lib";
 
   checkFlags = [
-    # thread 'python_data_access::tests::test_copy_string' panicked at 'called `Result::unwrap()` on an `Err`
-    "--skip=python_data_access::tests::test_copy_string"
-  ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
-    # panicked at 'called `Result::unwrap()` on an `Err` value: failed to get os threadid
-    "--skip=test_thread_reuse"
+    # assertion `left == right` failed
+    "--skip=test_negative_linenumber_increment"
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15d61c44a95e4c..bf30ec33521cb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5120,10 +5120,7 @@ with pkgs;
 
   pypass = with python3Packages; toPythonApplication pypass;
 
-  py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy {
-    # https://github.com/benfred/py-spy/issues/633
-    python3 = python311;
-  };
+  py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy { };
 
   pydeps = with python3Packages; toPythonApplication pydeps;