From 7d38a6281ef6b016492b64862a58ec34dd7e9772 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 16 Aug 2019 11:14:03 +0200 Subject: [PATCH] pyprof2calltree: move to python-packages pyprof2calltree is hard-coded to pythonPackages and fails for Python 3 profile results. See #66511. Since it can also be used as a library it makes sense to move it into pythonPackages. --- .../profiling => python-modules}/pyprof2calltree/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/{tools/profiling => python-modules}/pyprof2calltree/default.nix (88%) diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix similarity index 88% rename from pkgs/development/tools/profiling/pyprof2calltree/default.nix rename to pkgs/development/python-modules/pyprof2calltree/default.nix index a2d98bcf238..198445177c4 100644 --- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pyprof2calltree"; version = "1.4.4"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcba04a43b6..16d57be959f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9780,7 +9780,7 @@ in pprof = callPackage ../development/tools/profiling/pprof { }; - pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; + pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; prelink = callPackage ../development/tools/misc/prelink { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e0c9b498ac..ac100c2f3d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6158,6 +6158,8 @@ in { wget = callPackage ../development/python-modules/wget { }; runway-python = callPackage ../development/python-modules/runway-python { }; + + pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; }); in fix' (extends overrides packages)