alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #175387 from SuperSandro2000/psutil

Browse source
This commit is contained in:
Sandro 2022-05-30 06:48:31 +02:00 committed by GitHub
parent 0f9fa350d7 f8b7b90a57
commit bd7ac5d8c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/python-modules/psutil/default.nix
View file

@ -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" ];

4
pkgs/top-level/python-packages.nix
View file

@ -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 { };