From f8b7b90a57fd287537413b7fbbbdbb164c69e5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 May 2022 04:20:01 +0200 Subject: [PATCH] python310Packages.psutil: 5.9.0 -> 5.9.1 --- pkgs/development/python-modules/psutil/default.nix | 11 +++++------ pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 581e83ddf1a2..197da3c76ce6 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -1,18 +1,17 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python -, darwin +, IOKit , pytestCheckHook , mock -, ipaddress , unittest2 }: buildPythonPackage rec { pname = "psutil"; - version = "5.9.0"; + version = "5.9.1"; src = fetchPypi { inherit pname version; - sha256 = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25"; + sha256 = "sha256-V/GBm12elc37DIgailt9VC7Qt8Ui1XVwaoC+3ISMiVQ="; }; # We have many test failures on various parts of the package: @@ -24,7 +23,7 @@ buildPythonPackage rec { # https://github.com/giampaolo/psutil/issues/1912 doCheck = false; checkInputs = [ pytestCheckHook ] - ++ lib.optionals isPy27 [ mock ipaddress unittest2 ]; + ++ lib.optionals isPy27 [ mock unittest2 ]; # In addition to the issues listed above there are some that occure due to # our sandboxing which we can work around by disabling some tests: # - cpu_times was flaky on darwin @@ -42,7 +41,7 @@ buildPythonPackage rec { "cpu_freq" ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; pythonImportsCheck = [ "psutil" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 189207368ba3..afd24040a0b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6847,7 +6847,9 @@ in { psd-tools = callPackage ../development/python-modules/psd-tools { }; - psutil = callPackage ../development/python-modules/psutil { }; + psutil = callPackage ../development/python-modules/psutil { + inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; + }; psycopg2 = callPackage ../development/python-modules/psycopg2 { };