Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'

Conflicts:
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix

1 files changed, 30 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/memory-profiler/default.nix b/nixpkgs/pkgs/development/python-modules/memory-profiler/default.nix
new file mode 100644
index 000000000000..218772a1527e
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/memory-profiler/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, python
+, fetchPypi
+}:
+
+python.pkgs.buildPythonPackage rec {
+  pname = "memory-profiler";
+  version = "0.61.0";
+
+  src = fetchPypi {
+    pname = "memory_profiler";
+    inherit version;
+    sha256 = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A=";
+  };
+
+  propagatedBuildInputs = with python.pkgs; [
+    psutil # needed to profile child processes
+    matplotlib # needed for plotting memory usage
+  ];
+
+  meta = with lib; {
+    description = "A module for monitoring memory usage of a process";
+    longDescription = ''
+      This is a python module for monitoring memory consumption of a process as
+      well as line-by-line analysis of memory consumption for python programs.
+    '';
+    homepage = "https://pypi.python.org/pypi/memory_profiler";
+    license = licenses.bsd3;
+  };
+}