diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index d2e365e86b50..8dbc0145b610 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -2,12 +2,17 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, - mock, + + # dependencies psutil, - pytestCheckHook, - pythonOlder, six, + + # tests + mock, + pytestCheckHook, }: buildPythonPackage rec { @@ -15,8 +20,6 @@ buildPythonPackage rec { version = "1.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "square"; repo = "pylink"; @@ -24,6 +27,11 @@ buildPythonPackage rec { hash = "sha256-rkkdnpkl9UHcBDjp6lsFXR1zNn7tH1KeTQ7wV+yJ3m0="; }; + patches = [ + # ERROR: /build/source/setup.cfg:16: unexpected value continuation + ./fix-setup-cfg-syntax.patch + ]; + build-system = [ setuptools ]; dependencies = [ @@ -45,11 +53,11 @@ buildPythonPackage rec { "test_set_log_file_success" ]; - meta = with lib; { + meta = { description = "Python interface for the SEGGER J-Link"; homepage = "https://github.com/square/pylink"; changelog = "https://github.com/square/pylink/blob/${src.tag}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ dump_stack ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dump_stack ]; }; } diff --git a/pkgs/development/python-modules/pylink-square/fix-setup-cfg-syntax.patch b/pkgs/development/python-modules/pylink-square/fix-setup-cfg-syntax.patch new file mode 100644 index 000000000000..a4a3122dc782 --- /dev/null +++ b/pkgs/development/python-modules/pylink-square/fix-setup-cfg-syntax.patch @@ -0,0 +1,24 @@ +diff --git a/setup.cfg b/setup.cfg +index 22f5e1c..fcad35f 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -11,19 +11,3 @@ universal = 1 + [behave] + color = True + summary = True +- +-[options.extras_require] +- dev = +- behave==1.2.5 +- coverage==4.4.1 +- psutil>=5.2.2 +- pycodestyle>=2.3.1 +- setuptools>=70.2.0 +- six +- sphinx==1.4.8 +- sphinx-argparse==0.1.15 +- sphinx_rtd_theme==0.2.4 +- sphinxcontrib-napoleon==0.5.3 +- wheel +- test = +- mock==2.0.0