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

python3Packages.py-cpuinfo: 7.0.0 -> 8.0.0

authored by Martin Weinelt and committed by GitHub b7aedf86 4cbb35eb

+10 -22
+10 -22
pkgs/development/python-modules/py-cpuinfo/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , buildPythonPackage 6 5 , pytestCheckHook 7 6 , sysctl ··· 9 8 10 9 buildPythonPackage rec { 11 10 pname = "py-cpuinfo"; 12 - version = "7.0.0"; 11 + version = "8.0.0"; 13 12 14 13 src = fetchFromGitHub { 15 14 owner = "workhorsy"; 16 15 repo = pname; 17 16 rev = "v${version}"; 18 - sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi"; 17 + sha256 = "sha256-Mgzj1HTasUNHeHMVwV6d+TeyVqnBNUwCJ1EC3kfovf8="; 19 18 }; 20 19 21 - patches = [ 22 - # Make it detect Apple Silicon, remove after https://github.com/workhorsy/py-cpuinfo/pull/161 is merged. 23 - (fetchpatch { 24 - url = "https://github.com/workhorsy/py-cpuinfo/commit/54c32da6678f9d75ec5acf4534056cdc85c2a04d.patch"; 25 - sha256 = "sha256-3R46KrpACAQ1V0CQtz48V5mQXxvplUQrXnACtiE8WqY="; 26 - }) 27 - # Continuation of the patch above 28 - (fetchpatch { 29 - url = "https://github.com/workhorsy/py-cpuinfo/commit/0d00f4b99750f292c85ff23e1039ea9489cb7ec8.patch"; 30 - sha256 = "sha256-mHoXoCAEG2v3xpQppRFWzSvhYCp5i9CZkbEgtiLVzMs="; 31 - }) 32 - ]; 33 - 34 20 checkInputs = [ 35 21 pytestCheckHook 36 22 ]; ··· 42 28 --replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'" 43 29 ''; 44 30 45 - meta = { 46 - description = "Get CPU info with pure Python 2 & 3"; 31 + pythonImportsCheck = [ "cpuinfo" ]; 32 + 33 + meta = with lib; { 34 + description = "Get CPU info with pure Python"; 47 35 longDescription = '' 48 36 Py-cpuinfo gets CPU info with pure Python and should work without any 49 37 extra programs or libraries, beyond what your OS provides. It does not 50 38 require any compilation (C/C++, assembly, etc.) to use and works with 51 - Python 2 and 3. 39 + Python. 52 40 ''; 53 - inherit (src.meta) homepage; 41 + homepage = "https://github.com/workhorsy/py-cpuinfo"; 54 42 changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog"; 55 - license = lib.licenses.mit; 56 - maintainers = with lib.maintainers; [ costrouc ]; 43 + license = licenses.mit; 44 + maintainers = with maintainers; [ costrouc ]; 57 45 }; 58 46 }