lol

Merge pull request #313582 from fabaff/crc16-refactor

python312Packages.crc16: refactor, python312Packages.pyoppleio: refactor

authored by

Fabian Affolter and committed by
GitHub
a2ab4d5a eebc764a

+34 -19
+20 -5
pkgs/development/python-modules/crc16/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi }: 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchPypi, 5 + setuptools, 6 + pythonOlder, 7 + }: 2 8 3 9 buildPythonPackage rec { 4 10 pname = "crc16"; 5 11 version = "0.1.1"; 6 - format = "setuptools"; 12 + pyproject = true; 13 + 14 + disabled = pythonOlder "3.7"; 7 15 8 16 src = fetchPypi { 9 17 inherit pname version; 10 - sha256 = "15nkx0pa4lskwin84flpk8fsw3jqg6wic6v3s83syjqg76h6my61"; 18 + hash = "sha256-wfhqoDkPS68H0mMbFrl5WA6uHZqXOoJs5FNToi7o05Y="; 11 19 }; 12 20 21 + build-system = [ setuptools ]; 22 + 23 + # Tests are outdated 24 + doCheck = false; 25 + 26 + pythonImportsCheck = [ "crc16" ]; 27 + 13 28 meta = with lib; { 14 - homepage = "https://code.google.com/archive/p/pycrc16/"; 15 29 description = "Python library for calculating CRC16"; 16 - license = licenses.lgpl3; 30 + homepage = "https://code.google.com/archive/p/pycrc16/"; 31 + license = licenses.lgpl3Plus; 17 32 maintainers = with maintainers; [ abbradar ]; 18 33 }; 19 34 }
+14 -14
pkgs/development/python-modules/pyoppleio/default.nix
··· 1 - { lib 2 - , buildPythonPackage 3 - , crc16 4 - , fetchPypi 5 - , pythonOlder 1 + { 2 + lib, 3 + buildPythonPackage, 4 + crc16, 5 + fetchPypi, 6 + pythonOlder, 7 + setuptools, 6 8 }: 7 9 8 10 buildPythonPackage rec { 9 11 pname = "pyoppleio"; 10 12 version = "1.0.7"; 11 - format = "setuptools"; 13 + pyproject = true; 12 14 13 15 disabled = pythonOlder "3.7"; 14 16 ··· 17 19 hash = "sha256-S1w3pPqhX903kkXUq9ALz0+zRvNGOimLughRRVKjV8E="; 18 20 }; 19 21 20 - propagatedBuildInputs = [ 21 - crc16 22 - ]; 22 + build-system = [ setuptools ]; 23 + 24 + dependencies = [ crc16 ]; 23 25 24 26 # Module has no tests 25 27 doCheck = false; 26 28 27 - pythonImportsCheck = [ 28 - "pyoppleio" 29 - ]; 29 + pythonImportsCheck = [ "pyoppleio" ]; 30 30 31 31 meta = with lib; { 32 32 description = "Library for interacting with OPPLE lights"; 33 - mainProgram = "oppleio"; 34 33 homepage = "https://github.com/jedmeng/python-oppleio"; 35 - license = with licenses; [ asl20 ]; 34 + license = licenses.asl20; 36 35 maintainers = with maintainers; [ fab ]; 36 + mainProgram = "oppleio"; 37 37 }; 38 38 }