py-spy: 0.3.14-unstable-2024-02-27 -> 0.4.0

NixOS · Nov 19, 2024 · 8bb5bde · 8bb5bde
1 parent ab20acc
commit 8bb5bde
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix
@@ -9,21 +9,18 @@
 
 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=";
+  cargoHash = "sha256-SkHlXvhmw7swjZDdat0z0o5ATDJ1qSE/iwiwywsFOyw=";
 
-  # error: linker `arm-linux-gnueabihf-gcc` not found
-  postPatch = ''
-    rm .cargo/config
-  '';
+  buildFeatures = [ "unwind" ];
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
@@ -41,11 +38,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
@@ -5053,10 +5053,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;