Merge pull request #121740 from fabaff/bump-py-cpuinfo

python3Packages.py-cpuinfo: 7.0.0 -> 8.0.0
This commit is contained in:
Martin Weinelt 2021-05-05 00:03:52 +02:00 committed by GitHub
commit b7aedf86e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, buildPythonPackage
, pytestCheckHook
, sysctl
@ -9,28 +8,15 @@
buildPythonPackage rec {
pname = "py-cpuinfo";
version = "7.0.0";
version = "8.0.0";
src = fetchFromGitHub {
owner = "workhorsy";
repo = pname;
rev = "v${version}";
sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi";
sha256 = "sha256-Mgzj1HTasUNHeHMVwV6d+TeyVqnBNUwCJ1EC3kfovf8=";
};
patches = [
# Make it detect Apple Silicon, remove after https://github.com/workhorsy/py-cpuinfo/pull/161 is merged.
(fetchpatch {
url = "https://github.com/workhorsy/py-cpuinfo/commit/54c32da6678f9d75ec5acf4534056cdc85c2a04d.patch";
sha256 = "sha256-3R46KrpACAQ1V0CQtz48V5mQXxvplUQrXnACtiE8WqY=";
})
# Continuation of the patch above
(fetchpatch {
url = "https://github.com/workhorsy/py-cpuinfo/commit/0d00f4b99750f292c85ff23e1039ea9489cb7ec8.patch";
sha256 = "sha256-mHoXoCAEG2v3xpQppRFWzSvhYCp5i9CZkbEgtiLVzMs=";
})
];
checkInputs = [
pytestCheckHook
];
@ -42,17 +28,19 @@ buildPythonPackage rec {
--replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'"
'';
meta = {
description = "Get CPU info with pure Python 2 & 3";
pythonImportsCheck = [ "cpuinfo" ];
meta = with lib; {
description = "Get CPU info with pure Python";
longDescription = ''
Py-cpuinfo gets CPU info with pure Python and should work without any
extra programs or libraries, beyond what your OS provides. It does not
require any compilation (C/C++, assembly, etc.) to use and works with
Python 2 and 3.
Python.
'';
inherit (src.meta) homepage;
homepage = "https://github.com/workhorsy/py-cpuinfo";
changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ costrouc ];
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
};
}