From 156a0827bd7c9b06703b3cbf94f2035cd984d9f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 14:37:04 +0200 Subject: [PATCH 01/36] python3Packages.mypy-protobuf: Build using buildPythonPackage Reformat, tried to enable tests but we miss a dependency, added pythonImportsCheck. Added top-level attribute to expose executables. --- .../python-modules/mypy-protobuf/default.nix | 28 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 007fd2fd015f..c63910abc56c 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,6 +1,14 @@ -{ lib, fetchPypi, buildPythonApplication, protobuf, types-protobuf, grpcio-tools, pythonOlder }: +{ lib +, fetchPypi +, buildPythonPackage +, protobuf +, types-protobuf +, grpcio-tools +, pytestCheckHook +, pythonOlder +}: -buildPythonApplication rec { +buildPythonPackage rec { pname = "mypy-protobuf"; version = "3.3.0"; format = "pyproject"; @@ -12,7 +20,21 @@ buildPythonApplication rec { sha256 = "sha256-JPOwrssGZW6YP1jgfHMqkFd7nXrz4QZvwrZju/A3Akg="; }; - propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ]; + propagatedBuildInputs = [ + protobuf + types-protobuf + grpcio-tools + ]; + + doCheck = false; # ModuleNotFoundError: No module named 'testproto' + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mypy_protobuf" + ]; meta = with lib; { description = "Generate mypy stub files from protobuf specs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80f7c717a3da..bd1184d1f98b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17614,6 +17614,8 @@ with pkgs; mypy = with python3Packages; toPythonApplication mypy; + mypy-protobuf = with python3Packages; toPythonApplication mypy-protobuf; + nsis = callPackage ../development/tools/nsis { }; tockloader = callPackage ../development/tools/misc/tockloader { }; From 974f1ece20a67a4bc5ae1e7d774833ac75888dd1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 14:49:05 +0200 Subject: [PATCH 02/36] python3Packages.python-heatclient: Use buildPythonPackage and expose as top-level attribute. --- pkgs/development/python-modules/python-heatclient/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index c51c222dd6fa..df1fc0dc4597 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -1,6 +1,6 @@ { lib , babel -, buildPythonApplication +, buildPythonPackage , cliff , fetchPypi , iso8601 @@ -20,7 +20,7 @@ , testscenarios }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "python-heatclient"; version = "3.1.0"; format = "setuptools"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd1184d1f98b..c65f3321a4b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21178,6 +21178,7 @@ with pkgs; openslp = callPackage ../development/libraries/openslp {}; openstackclient = with python3Packages; toPythonApplication python-openstackclient; + heatclient = with python3Packages; toPythonApplication python-heatclient; openvdb = callPackage ../development/libraries/openvdb {}; From 17b976e99f0d19df7ef5d301c5b31d4f38d53f56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 14:50:33 +0200 Subject: [PATCH 03/36] python3Packages: Use buildPythonPackage Also enables tests and fixes import check module name. --- .../python-modules/mkdocs-redirects/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix index 94bf504a76b6..9394692fc5cf 100644 --- a/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -1,11 +1,12 @@ { lib , callPackage -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , mkdocs +, pytestCheckHook }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "mkdocs-redirects"; version = "1.2.0"; @@ -20,7 +21,13 @@ buildPythonApplication rec { mkdocs ]; - pythonImportsCheck = [ "mkdocs" ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mkdocs_redirects" + ]; meta = with lib; { description = "Open source plugin for Mkdocs page redirects"; From 1ec7b00db38ccc0f126fd453ee55568048d29feb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 14:58:23 +0200 Subject: [PATCH 04/36] python3Packages.filecheck: Use buildPythonPackage Build using poetry-core, enabled tests, expose as top-level attribute. --- .../python-modules/filecheck/default.nix | 25 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/filecheck/default.nix b/pkgs/development/python-modules/filecheck/default.nix index 2480c196881a..9cbd8bde2117 100644 --- a/pkgs/development/python-modules/filecheck/default.nix +++ b/pkgs/development/python-modules/filecheck/default.nix @@ -1,10 +1,11 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub -, poetry +, poetry-core +, pytestCheckHook }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "filecheck"; version = "0.0.22"; format = "pyproject"; @@ -16,9 +17,23 @@ buildPythonApplication rec { sha256 = "sha256-I2SypKkgcVuLyLiwNw5oWDb9qT56TbC6vbui8PEcziI="; }; - nativeBuildInputs = [ poetry ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" "poetry-core" \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; - pythonImportsCheck = [ "filecheck" ]; + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "filecheck" + ]; meta = with lib; { homepage = "https://github.com/mull-project/FileCheck.py"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c65f3321a4b1..b88d696138f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13398,6 +13398,8 @@ with pkgs; fasmg = callPackage ../development/compilers/fasmg { }; + filecheck = with python3Packages; toPythonApplication filecheck; + firrtl = callPackage ../development/compilers/firrtl { }; flasm = callPackage ../development/compilers/flasm { }; From a91ecb2e254cab9600babc79848b216f46c72119 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 15:05:25 +0200 Subject: [PATCH 05/36] rfc-bibtex: Migrate out of python3Packages This is a commandline tool, that does not advertise itself as as consumable library, so it does not belong into the python package set. Also fetch from git, so we can enable the tests. --- .../python-modules/rfc-bibtex/default.nix | 20 ----------- pkgs/tools/typesetting/rfc-bibtex/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 34 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/python-modules/rfc-bibtex/default.nix create mode 100644 pkgs/tools/typesetting/rfc-bibtex/default.nix diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix deleted file mode 100644 index b9b7cdb76c4f..000000000000 --- a/pkgs/development/python-modules/rfc-bibtex/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPythonApplication, fetchPypi, isPy3k }: - -buildPythonApplication rec { - pname = "rfc-bibtex"; - version = "0.3.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "60419a2043ef37ac2438f3eae7a3207d0a4cb2dd56ab21697f874a35ee52927f"; - }; - - disabled = !isPy3k; - - meta = with lib; { - homepage = "https://github.com/iluxonchik/rfc-bibtex/"; - description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts"; - license = licenses.mit; - maintainers = with maintainers; [ teto ]; - }; -} diff --git a/pkgs/tools/typesetting/rfc-bibtex/default.nix b/pkgs/tools/typesetting/rfc-bibtex/default.nix new file mode 100644 index 000000000000..de38b4cd29c2 --- /dev/null +++ b/pkgs/tools/typesetting/rfc-bibtex/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +with python3.pkgs; buildPythonApplication rec { + pname = "rfc-bibtex"; + version = "0.3.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "iluxonchik"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-bPCNQqiG50vWVFA6J2kyxftwsXunHTNBdSkoIRYkb0s="; + }; + + checkInputs = [ + pytestCheckHook + vcrpy + ]; + + pythonImportsCheck = [ + "rfc_bibtex" + ]; + + meta = with lib; { + homepage = "https://github.com/iluxonchik/rfc-bibtex/"; + description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts"; + license = licenses.mit; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b88d696138f6..b7aae58d7333 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36416,7 +36416,7 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; - rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; + rfc-bibtex = callPackage ../tools/typesetting/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { inherit glib gtk3 gobject-introspection wrapGAppsHook; From b32cb3b75646e9432d4bcf9b8f26c4ea83fba4d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 15:08:07 +0200 Subject: [PATCH 06/36] python3Packages.expiringdict: Use buildPythonPackage Also some package quality fixes. --- .../python-modules/expiringdict/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/expiringdict/default.nix b/pkgs/development/python-modules/expiringdict/default.nix index 942feff4513f..9dfe60aca7e3 100644 --- a/pkgs/development/python-modules/expiringdict/default.nix +++ b/pkgs/development/python-modules/expiringdict/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , dill , coverage @@ -8,16 +8,17 @@ , nose }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "expiringdict"; version = "1.2.2"; + format = "setuptools"; # use fetchFromGitHub instead of fetchPypi because the test suite of # the package is not included into the PyPI tarball src = fetchFromGitHub { owner = "mailgun"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; }; @@ -30,14 +31,18 @@ buildPythonApplication rec { ]; checkPhase = '' + runHook preCheck nosetests -v --with-coverage --cover-package=expiringdict + runHook postCheck ''; - pythonImportsCheck = [ "expiringdict" ]; + pythonImportsCheck = [ + "expiringdict" + ]; meta = with lib; { description = "Dictionary with auto-expiring values for caching purposes"; - homepage = "https://pypi.org/project/expiringdict/"; + homepage = "https://github.com/mailgun/expiringdict"; license = licenses.asl20; maintainers = with maintainers; [ gravndal ]; }; From f3416858078bf519609b8559312bf18e1ba1fe3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 15:15:35 +0200 Subject: [PATCH 07/36] python3Packages.python-glanceclient: Use buildPythonPackage and add a top-level attribute. --- .../python-modules/python-glanceclient/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 4f63cca8a8b1..390aad8b55cd 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , coreutils , pbr @@ -18,7 +18,7 @@ , requests-mock }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "python-glanceclient"; version = "4.1.0"; format = "setuptools"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7aae58d7333..32f37add7ce7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21180,6 +21180,7 @@ with pkgs; openslp = callPackage ../development/libraries/openslp {}; openstackclient = with python3Packages; toPythonApplication python-openstackclient; + glanceclient = with python3Packages; toPythonApplication python-glanceclient; heatclient = with python3Packages; toPythonApplication python-heatclient; openvdb = callPackage ../development/libraries/openvdb {}; From 8252b7387e320be45704a28779df6160c00d52ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 15:22:36 +0200 Subject: [PATCH 08/36] python3Packages.mkdocs-material: Use buildPythonPackage --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index f58bbf2e69d6..d82c1a654362 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -1,6 +1,6 @@ { lib , callPackage -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , jinja2 , markdown @@ -11,7 +11,7 @@ , pythonOlder }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "mkdocs-material"; version = "8.4.3"; format = "setuptools"; From 32f2486bf7f76d8c7d39cf7250c101ffca83581d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 15:24:15 +0200 Subject: [PATCH 09/36] python3Packages.clintermission: Use buildPythonPackage and reformat. --- .../python-modules/clintermission/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix index a0e5dcb7142f..b5df005978c4 100644 --- a/pkgs/development/python-modules/clintermission/default.nix +++ b/pkgs/development/python-modules/clintermission/default.nix @@ -1,8 +1,15 @@ -{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt-toolkit }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, prompt-toolkit }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "clintermission"; version = "0.2.0"; + format = "setuptools"; + + disabled = !isPy3k; src = fetchFromGitHub { owner = "sebageek"; @@ -11,14 +18,16 @@ buildPythonApplication rec { sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv"; }; - propagatedBuildInputs = [ prompt-toolkit ]; - - disabled = !isPy3k; + propagatedBuildInputs = [ + prompt-toolkit + ]; # repo contains no tests doCheck = false; - pythonImportsCheck = [ "clintermission" ]; + pythonImportsCheck = [ + "clintermission" + ]; meta = with lib; { description = "Non-fullscreen command-line selection menu"; From a2b1eaa06390979fde2fa396d540405ffb9c51f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 15:29:31 +0200 Subject: [PATCH 10/36] poetry2conda: Migrate out of python package set --- .../package-management}/poetry2conda/default.nix | 10 ++-------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 4 insertions(+), 11 deletions(-) rename pkgs/{development/python-modules => tools/package-management}/poetry2conda/default.nix (84%) diff --git a/pkgs/development/python-modules/poetry2conda/default.nix b/pkgs/tools/package-management/poetry2conda/default.nix similarity index 84% rename from pkgs/development/python-modules/poetry2conda/default.nix rename to pkgs/tools/package-management/poetry2conda/default.nix index 7f5268a23dc4..1e570156f8c9 100644 --- a/pkgs/development/python-modules/poetry2conda/default.nix +++ b/pkgs/tools/package-management/poetry2conda/default.nix @@ -1,15 +1,9 @@ { lib -, buildPythonApplication , fetchFromGitHub -, pytest-mock -, pytestCheckHook -, toml -, poetry -, poetry-semver -, pyyaml +, python3 }: -buildPythonApplication rec { +with python3.pkgs; buildPythonApplication rec { pname = "poetry2conda"; version = "0.3.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32f37add7ce7..28b98161843b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15500,7 +15500,7 @@ with pkgs; inherit pkgs lib; }; - poetry2conda = python3Packages.callPackage ../development/python-modules/poetry2conda { }; + poetry2conda = callPackage ../tools/package-management/poetry2conda { }; pip-audit = callPackage ../development/tools/pip-audit {}; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e41b075ce710..4333585eb5e6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -109,6 +109,7 @@ mapAliases ({ pathpy = path; # added 2022-04-12 pdfminer = pdfminer-six; # added 2022-05-25 pep257 = pydocstyle; # added 2022-04-12 + poetry2conda = throw "poetry2conda was promoted to a top-level attribute"; # Added 2022-10-02 poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5fc08d1d688a..c2073057e0e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7157,8 +7157,6 @@ in { poetry-semver = callPackage ../development/python-modules/poetry-semver { }; - poetry2conda = callPackage ../development/python-modules/poetry2conda { }; - poezio = callPackage ../applications/networking/instant-messengers/poezio { }; polars = callPackage ../development/python-modules/polars { }; From b75d1a480d62b1413dd9619e4f303f7065173db0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 15:39:54 +0200 Subject: [PATCH 11/36] python3Packages.gprof2dot: Use buildPythonPackage and expose as top-level attribute. --- pkgs/development/python-modules/gprof2dot/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index 4eb3a79e5e87..1536c5fcbdb3 100644 --- a/pkgs/development/python-modules/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -1,13 +1,14 @@ { lib , fetchFromGitHub -, buildPythonApplication +, buildPythonPackage , python , graphviz }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "gprof2dot"; version = "2021.02.21"; + format = "setuptools"; src = fetchFromGitHub { owner = "jrfonseca"; @@ -36,6 +37,6 @@ buildPythonApplication rec { homepage = "https://github.com/jrfonseca/gprof2dot"; description = "Python script to convert the output from many profilers into a dot graph"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.pmiddend ]; + maintainers = with maintainers; [ pmiddend ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28b98161843b..3654576eb131 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7241,6 +7241,8 @@ with pkgs; hamlib = hamlib_4; }; + gprof2dot = with python3Packages; toPythonApplication gprof2dot; + gprojector = callPackage ../applications/science/astronomy/gprojector { }; gptfdisk = callPackage ../tools/system/gptfdisk { }; From 565a8187a46ab2b4d3a12f97efab1aa4134fd83f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 15:47:02 +0200 Subject: [PATCH 12/36] python3Packages.sybil: Use buildPythonPackage --- pkgs/development/python-modules/sybil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 41baf697fff3..2667f0af5464 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -1,11 +1,11 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , pytestCheckHook , pythonOlder }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "sybil"; version = "3.0.1"; format = "setuptools"; From 98de11b31758ff1b9ab48c48fc44dbde48e7d2e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 15:57:39 +0200 Subject: [PATCH 13/36] mutmut: Migrate out of python package set Does not provide a library interface that could be imported and as such has no place within the python package set. --- .../{python-modules => tools}/mutmut/default.nix | 11 ++--------- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 5 insertions(+), 11 deletions(-) rename pkgs/development/{python-modules => tools}/mutmut/default.nix (86%) diff --git a/pkgs/development/python-modules/mutmut/default.nix b/pkgs/development/tools/mutmut/default.nix similarity index 86% rename from pkgs/development/python-modules/mutmut/default.nix rename to pkgs/development/tools/mutmut/default.nix index 626c768f2a81..4b40930c646d 100644 --- a/pkgs/development/python-modules/mutmut/default.nix +++ b/pkgs/development/tools/mutmut/default.nix @@ -1,16 +1,9 @@ { lib , fetchFromGitHub -, buildPythonApplication -, click -, glob2 -, parso -, pony -, junit-xml -, pythonOlder -, testers +, python3 }: -let self = buildPythonApplication rec { +let self = with python3.pkgs; buildPythonApplication rec { pname = "mutmut"; version = "2.2.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3654576eb131..abc0e423127a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -737,6 +737,8 @@ with pkgs; owl = callPackage ../tools/networking/owl { }; + mutmut = callPackage ../development/tools/mutmut { }; + packcc = callPackage ../development/tools/packcc { }; packer = callPackage ../development/tools/packer { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4333585eb5e6..afaedf9a6e5d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -101,6 +101,7 @@ mapAliases ({ mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 + mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2073057e0e0..f4595081ac2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5950,8 +5950,6 @@ in { mutf8 = callPackage ../development/python-modules/mutf8 { }; - mutmut = callPackage ../development/python-modules/mutmut { }; - mujson = callPackage ../development/python-modules/mujson { }; mwclient = callPackage ../development/python-modules/mwclient { }; From 2649e800edab06f2fb310e26f90231171ee0cc9c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 16:02:17 +0200 Subject: [PATCH 14/36] python3Packages.pypass: Add top-level attribute --- pkgs/development/python-modules/pypass/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 85d6c9d49bb0..f70e40029992 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -18,10 +18,8 @@ , xclip }: -# NOTE: pypass can also be used as an application, but probably the most -# important usecase is as a library. So, let's use buildPythonPackage and -# support any Python version instead of defining it as an application with -# buildPythonApplication. +# Use the `pypass` top-level attribute, if you're interested in the +# application buildPythonPackage rec { pname = "pypass"; version = "0.2.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abc0e423127a..5c08138a7d4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10384,6 +10384,8 @@ with pkgs; pyocd = python3Packages.callPackage ../development/embedded/pyocd { }; + pypass = with python3Packages; toPythonApplication pypass; + pyspread = libsForQt5.callPackage ../applications/office/pyspread { }; teapot = callPackage ../applications/office/teapot { }; From 227aec9ac17dc0d4638c4188e1e8c8091728f2f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 16:14:53 +0200 Subject: [PATCH 15/36] python3Packages.griffe: Use buildPythonPackage and expose griffe as top-level attribute. --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index f7e9fd75855f..43191ca0b892 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -1,6 +1,6 @@ { lib , aiofiles -, buildPythonApplication +, buildPythonPackage , cached-property , fetchFromGitHub , git @@ -9,7 +9,7 @@ , pythonOlder }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "griffe"; version = "0.22.0"; format = "pyproject"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c08138a7d4c..38056324332d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16695,6 +16695,8 @@ with pkgs; graphene = callPackage ../development/libraries/graphene { }; + griffe = with python3Packages; toPythonApplication griffe; + gtk-doc = callPackage ../development/tools/documentation/gtk-doc { }; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; From d889b1b2985784ee8f234f3372ba5e7cbc3d0216 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:01:48 +0200 Subject: [PATCH 16/36] notifymuch: Migrate out of python package set It's an application with no visible library surface, so it has no place in the python package set. --- .../misc}/notifymuch/default.nix | 16 +++++++--------- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 10 insertions(+), 11 deletions(-) rename pkgs/{development/python-modules => applications/misc}/notifymuch/default.nix (88%) diff --git a/pkgs/development/python-modules/notifymuch/default.nix b/pkgs/applications/misc/notifymuch/default.nix similarity index 88% rename from pkgs/development/python-modules/notifymuch/default.nix rename to pkgs/applications/misc/notifymuch/default.nix index bc1610e2ca94..e94b6f2f156b 100644 --- a/pkgs/development/python-modules/notifymuch/default.nix +++ b/pkgs/applications/misc/notifymuch/default.nix @@ -1,19 +1,16 @@ { lib -, buildPythonApplication -, isPy3k , fetchFromGitHub -, notmuch -, pygobject3 , gobject-introspection , libnotify , wrapGAppsHook , gtk3 +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "notifymuch"; version = "0.1"; - disabled = !isPy3k; + format = "setuptools"; src = fetchFromGitHub { owner = "kspi"; @@ -24,11 +21,12 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - notmuch - pygobject3 libnotify gtk3 - ]; + ] ++ (with python3.pkgs; [ + notmuch + pygobject3 + ]); nativeBuildInputs = [ gobject-introspection diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38056324332d..e7d229249afb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4512,6 +4512,8 @@ with pkgs; notify = callPackage ../tools/misc/notify { }; + notifymuch = callPackage ../applications/misc/notifymuch { }; + npins = callPackage ../tools/nix/npins { }; nrsc5 = callPackage ../applications/misc/nrsc5 { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index afaedf9a6e5d..72fb1fa0ee1f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -104,6 +104,7 @@ mapAliases ({ mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 + notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4595081ac2c..cecd0418e73f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6250,8 +6250,6 @@ in { notify2 = callPackage ../development/python-modules/notify2 { }; - notifymuch = callPackage ../development/python-modules/notifymuch {}; - notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; From cd016901b1ede81a8714549ee1048e9a1756612b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:02:32 +0200 Subject: [PATCH 17/36] phonemizer: Use buildPythonPackage and add a top-level attribute. The package is broken and needs an updated patch, but that does not mean this change is wrong. --- pkgs/development/python-modules/phonemizer/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 550a4fefd25a..38e5f8533eb3 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , substituteAll -, buildPythonApplication +, buildPythonPackage , fetchPypi , joblib , segments @@ -13,17 +13,18 @@ , pytest-cov }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "phonemizer"; version = "3.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bo+F+FqKmtxjijeHrqyvcaU+R1eLEtdzwJdDNQDNiSs="; + hash = "sha256-Bo+F+FqKmtxjijeHrqyvcaU+R1eLEtdzwJdDNQDNiSs="; }; postPatch = '' - sed -i -e '/\'pytest-runner\'/d setup.py + sed -i '/pytest-runner/d setup.py ''; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7d229249afb..f1c7bad114bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33114,6 +33114,8 @@ with pkgs; nux = callPackage ../tools/misc/nux { }; + phonemizer = with python3Packages; toPythonApplication phonemizer; + tts = callPackage ../tools/audio/tts { }; ### GAMES From c2379dbd43fbda68b68a4f810c96f8e1195ca79f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:16:31 +0200 Subject: [PATCH 18/36] python3Packages.python-swiftclient: use buildPythonPackage --- .../development/python-modules/python-swiftclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index 3329753d6334..f5a15a34f0ca 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , installShellFiles , mock @@ -10,7 +10,7 @@ , stestr }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "python-swiftclient"; version = "4.1.0"; format = "setuptools"; From b934a91f704ef61d786b36533651350fbf15326f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:24:37 +0200 Subject: [PATCH 19/36] gigalixir: Migrate out of python package set This is a CLI client and not a library and as such it has no place in the python package set. --- .../misc}/gigalixir/default.nix | 37 ++++++------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 14 insertions(+), 28 deletions(-) rename pkgs/{development/python-modules => tools/misc}/gigalixir/default.nix (76%) diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/tools/misc/gigalixir/default.nix similarity index 76% rename from pkgs/development/python-modules/gigalixir/default.nix rename to pkgs/tools/misc/gigalixir/default.nix index c32c98fb3dd2..c3710ca94487 100644 --- a/pkgs/development/python-modules/gigalixir/default.nix +++ b/pkgs/tools/misc/gigalixir/default.nix @@ -1,34 +1,26 @@ { stdenv , lib -, buildPythonApplication -, click -, fetchPypi +, python3 , git -, httpretty -, qrcode -, pygments -, pyopenssl -, pytestCheckHook -, requests -, rollbar -, stripe -, pythonOlder -, sure }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "gigalixir"; version = "1.3.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; hash = "sha256-kNtybgv8j7t1tl6R5ZuC4vj5fnEcEenuNt0twA1kAh0="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" \ + --replace "cryptography==" "cryptography>=" + ''; + + propagatedBuildInputs = with python3.pkgs; [ click pygments pyopenssl @@ -40,16 +32,11 @@ buildPythonApplication rec { checkInputs = [ git + ] ++ (with python3.pkgs; [ httpretty pytestCheckHook sure - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" \ - --replace "cryptography==" "cryptography>=" - ''; + ]); disabledTests = [ # Test requires network access diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1c7bad114bc..cd62768787af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27689,7 +27689,7 @@ with pkgs; gg-scm = callPackage ../applications/version-management/git-and-tools/gg { }; - gigalixir = with python3Packages; toPythonApplication gigalixir; + gigalixir = callPackage ../tools/misc/gigalixir { }; go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 72fb1fa0ee1f..a9ea2323a67e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -73,6 +73,7 @@ mapAliases ({ flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 garminconnect-ha = garminconnect; # added 2022-02-05 + gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2022-09-24 googleapis_common_protos = throw "'googleapis_common_protos' has been renamed to/replaced by 'googleapis-common-protos'"; # Converted to throw 2022-09-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cecd0418e73f..8cb9d6c3f57a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3739,8 +3739,6 @@ in { gidgethub = callPackage ../development/python-modules/gidgethub { }; - gigalixir = callPackage ../development/python-modules/gigalixir { }; - gin-config = callPackage ../development/python-modules/gin-config { }; gios = callPackage ../development/python-modules/gios { }; From d677311d4613c84469d7a7fb018bdc6b199a7f8f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:28:35 +0200 Subject: [PATCH 20/36] python3Packages.screeninfo: Use buildPythonPackage --- pkgs/development/python-modules/screeninfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index f67d68b0dddd..574d3159494a 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, buildPythonApplication +, buildPythonPackage , dataclasses , fetchFromGitHub , libX11 @@ -11,7 +11,7 @@ , pythonOlder }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "screeninfo"; version = "0.8.1"; format = "pyproject"; From 1f71c25333dcda2ac3f9f9a3587962ccf92b744f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:41:25 +0200 Subject: [PATCH 21/36] python2Packages.yolk: drop Was introduced in 2016 with only a top-level attribute, which got removed in the same year, so hasn't been used since. Also last commit in 2013, uses python2 print statements, so it has to go. --- .../python-modules/yolk/default.nix | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 pkgs/development/python-modules/yolk/default.nix diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix deleted file mode 100644 index d241e3f8edc0..000000000000 --- a/pkgs/development/python-modules/yolk/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchurl, buildPythonApplication, pythonPackages }: - -with lib; - -buildPythonApplication rec { - pname = "yolk"; - version = "0.4.3"; - - src = fetchurl { - url = "mirror://pypi/y/yolk/yolk-${version}.tar.gz"; - sha256 = "1f6xwx210jnl5nq0m3agh2p1cxmaizawaf3fwq43q4yw050fn1qw"; - }; - - buildInputs = with pythonPackages; [ nose ]; - - meta = { - description = "Command-line tool for querying PyPI and Python packages installed on your system"; - homepage = "https://github.com/cakebread/yolk"; - maintainers = with maintainers; []; - license = licenses.bsd3; - }; -} - From 24110fcf92897639c003fe7f5e4305788f918c0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:51:09 +0200 Subject: [PATCH 22/36] python3Packages.ironicclient: Use buildPythonPackage and expose as ironicclient top-level attribute. --- .../python-modules/python-ironicclient/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 5f0f1d8dea53..bf41e95739e9 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , pbr , appdirs @@ -18,7 +18,7 @@ , oslotest }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "python-ironicclient"; version = "5.0.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd62768787af..dae5c6e379d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21192,6 +21192,7 @@ with pkgs; openstackclient = with python3Packages; toPythonApplication python-openstackclient; glanceclient = with python3Packages; toPythonApplication python-glanceclient; heatclient = with python3Packages; toPythonApplication python-heatclient; + ironicclient = with python3Packages; toPythonApplication python-ironicclient; openvdb = callPackage ../development/libraries/openvdb {}; From 97b667de3bbe534c99b5caf8ef1680c9c26e39d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:54:11 +0200 Subject: [PATCH 23/36] python3Packages.remarshal: Use buildPythonPackage --- pkgs/development/python-modules/remarshal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index 99c868eb0b80..2b7a20a2dd00 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub # build deps @@ -16,7 +16,7 @@ , pytestCheckHook }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "remarshal"; version = "0.14.0"; format = "pyproject"; From 28e35ec966405e011aca1640c8a1224c119e243d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:55:58 +0200 Subject: [PATCH 24/36] python3Packages.mkdocs-autorefs: use buildPythonPackage --- pkgs/development/python-modules/mkdocs-autorefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index ea1dffdf0db0..dd88bd332e0e 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , markdown , mkdocs @@ -8,7 +8,7 @@ , pythonOlder }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "mkdocs-autorefs"; version = "0.4.1"; format = "pyproject"; From 08ad607288bcbdf2eec17f4bdfc596fbef5eea9a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:56:49 +0200 Subject: [PATCH 25/36] python3Packages.language-data: use buildPythonPackage --- pkgs/development/python-modules/language-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix index 803df3abaea5..ff04b036dc05 100644 --- a/pkgs/development/python-modules/language-data/default.nix +++ b/pkgs/development/python-modules/language-data/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , marisa-trie , poetry-core @@ -7,7 +7,7 @@ , setuptools }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "language-data"; version = "1.0.1"; format = "pyproject"; From 5f14d6e82813cdf591f99a7add743d7167496691 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 17:57:37 +0200 Subject: [PATCH 26/36] python3Packages.mkdocstrings: use buildPythonPackage --- pkgs/development/python-modules/mkdocstrings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index b151727a8fbd..5d20ea1a6e97 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , jinja2 , markdown @@ -12,7 +12,7 @@ , pythonOlder }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "mkdocstrings"; version = "0.19.0"; format = "pyproject"; From df99716e494081b3a37dedf756c1faa5629eefe2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:05:42 +0200 Subject: [PATCH 27/36] python3Packages.codespell: Migrate out of python package set --- .../codespell/default.nix | 16 +++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 15 insertions(+), 6 deletions(-) rename pkgs/development/{python-modules => tools}/codespell/default.nix (82%) diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/tools/codespell/default.nix similarity index 82% rename from pkgs/development/python-modules/codespell/default.nix rename to pkgs/development/tools/codespell/default.nix index e8be4644910c..07b1b4c96c3e 100644 --- a/pkgs/development/python-modules/codespell/default.nix +++ b/pkgs/development/tools/codespell/default.nix @@ -1,8 +1,13 @@ -{ lib, buildPythonApplication, fetchFromGitHub, pytestCheckHook, pytest-dependency, aspell-python, aspellDicts, chardet }: +{ lib +, fetchFromGitHub +, aspellDicts +, python3 +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "codespell"; version = "2.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "codespell-project"; @@ -17,7 +22,12 @@ buildPythonApplication rec { --replace "--cov-report=" "" ''; - checkInputs = [ aspell-python chardet pytestCheckHook pytest-dependency ]; + checkInputs = with python3.pkgs; [ + aspell-python + chardet + pytestCheckHook + pytest-dependency + ]; preCheck = '' export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dae5c6e379d7..0bee0afb909e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2406,7 +2406,7 @@ with pkgs; cod = callPackage ../tools/misc/cod { }; - codespell = with python3Packages; toPythonApplication codespell; + codespell = callPackage ../development/tools/codespell { }; coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a9ea2323a67e..79231ed51b07 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -43,6 +43,7 @@ mapAliases ({ bt_proximity = throw "'bt_proximity' has been renamed to/replaced by 'bt-proximity'"; # Converted to throw 2022-09-24 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 + codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02 ConfigArgParse = throw "'ConfigArgParse' has been renamed to/replaced by 'configargparse'"; # Converted to throw 2022-09-24 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cb9d6c3f57a..5abf2acf8cf4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1962,8 +1962,6 @@ in { codepy = callPackage ../development/python-modules/codepy { }; - codespell = callPackage ../development/python-modules/codespell { }; - cogapp = callPackage ../development/python-modules/cogapp { }; coinmetrics-api-client = callPackage ../development/python-modules/coinmetrics-api-client { }; From 2cf6c1f1b3e46894c5bfc957c2382cc5ecadd8cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:07:51 +0200 Subject: [PATCH 28/36] python3Packages.drivelib: Use buildPythonPackage --- pkgs/development/python-modules/drivelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drivelib/default.nix b/pkgs/development/python-modules/drivelib/default.nix index 526e58d14340..7b0a629e8a89 100644 --- a/pkgs/development/python-modules/drivelib/default.nix +++ b/pkgs/development/python-modules/drivelib/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , expiringdict , google-auth-httplib2 @@ -7,7 +7,7 @@ , google-api-python-client }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "drivelib"; version = "0.3.0"; From 91d0e1f8781983c759edbd31a0e2709bb4318a7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:13:32 +0200 Subject: [PATCH 29/36] python3Packages.mkdocs-minify: Use buildPythonPackage and enable test suite. --- .../python-modules/mkdocs-minify/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-minify/default.nix b/pkgs/development/python-modules/mkdocs-minify/default.nix index 0beeb5164160..ee6765d31751 100644 --- a/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -1,14 +1,15 @@ { lib , callPackage -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , mkdocs , csscompressor , htmlmin , jsmin +, pytestCheckHook }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "mkdocs-minify"; version = "0.5.0"; @@ -26,6 +27,11 @@ buildPythonApplication rec { mkdocs ]; + checkInputs = [ + mkdocs + pytestCheckHook + ]; + pythonImportsCheck = [ "mkdocs" ]; meta = with lib; { From f1510313aa59d85883ec7fe5f7f83f47714d5466 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:15:05 +0200 Subject: [PATCH 30/36] python3Packages.mkdocstrings-python: Use buildPythonPackage --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 4e10c4287d8c..58ead5774496 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , griffe , mkdocs-material @@ -9,7 +9,7 @@ , pythonOlder }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "mkdocstrings-python"; version = "0.7.1"; format = "pyproject"; From 670d203938e1ad55f517deb1151ce731f2c47b47 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:23:34 +0200 Subject: [PATCH 31/36] python3Packages.down: Use buildPythonPackage --- pkgs/development/python-modules/gdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 3368706c8c12..bd29bec95433 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -1,6 +1,6 @@ { lib , beautifulsoup4 -, buildPythonApplication +, buildPythonPackage , fetchPypi , filelock , requests @@ -9,7 +9,7 @@ , six }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "gdown"; version = "4.5.1"; format = "setuptools"; From a7a6688dc352aa91ff347dba0cb4bb2e24dc469d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:26:29 +0200 Subject: [PATCH 32/36] python3Packages.jsbeautifier: Use buildPythonPackage and expose as top-level attribute. --- pkgs/development/python-modules/jsbeautifier/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 242b282d4dd2..62ca71d52fda 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,13 +1,13 @@ { lib , fetchPypi -, buildPythonApplication +, buildPythonPackage , editorconfig , pytestCheckHook , pythonOlder , six }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "jsbeautifier"; version = "1.14.6"; format = "setuptools"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bee0afb909e..1c897ab386d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8025,6 +8025,8 @@ with pkgs; jsawk = callPackage ../tools/text/jsawk { }; + jsbeautifier = with python3Packages; toPythonApplication jsbeautifier; + jscoverage = callPackage ../development/tools/misc/jscoverage { }; jsduck = callPackage ../development/tools/jsduck { }; From e755d64d655e8605306a2c39ae11728a92f2ba66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:28:50 +0200 Subject: [PATCH 33/36] python3Packages.python-manilaclient: Use buildPythonPackage and expose a top-level attribute. --- .../python-modules/python-manilaclient/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 9a9e01ff4be7..301ce42f0c77 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , installShellFiles , pbr @@ -21,7 +21,7 @@ , pythonOlder }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "python-manilaclient"; version = "4.1.0"; format = "setuptools"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c897ab386d0..30d53a6006f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21195,6 +21195,7 @@ with pkgs; glanceclient = with python3Packages; toPythonApplication python-glanceclient; heatclient = with python3Packages; toPythonApplication python-heatclient; ironicclient = with python3Packages; toPythonApplication python-ironicclient; + manilaclient = with python3Packages; toPythonApplication python-manilaclient; openvdb = callPackage ../development/libraries/openvdb {}; From f0e5c494b4f79541ab11cea2b46dd54c5e31d15d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:43:21 +0200 Subject: [PATCH 34/36] python3Packages.coconut: Use buildPythonPackage --- pkgs/development/python-modules/coconut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index b7301cf1e73a..dec024fa8385 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , cpyparsing , ipykernel @@ -12,7 +12,7 @@ , watchdog }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "coconut"; version = "1.6.0"; From f45e641a9f28b15f182c3c00c7ca15224b1b4530 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:50:37 +0200 Subject: [PATCH 35/36] python3Packages.behave: Use buildPythonPackage and expose top-level attribute. --- pkgs/development/python-modules/behave/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 5254f79c4b2f..1030e589a21d 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub -, buildPythonApplication, python +, buildPythonPackage, python , pytestCheckHook, mock, path, pyhamcrest, pytest-html , glibcLocales , colorama, cucumber-tag-expressions, parse, parse-type, six }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "behave"; version = "1.2.7.dev2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30d53a6006f7..5b339173e3b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3083,6 +3083,8 @@ with pkgs; tezos-rust-libs = callPackage ../development/libraries/tezos-rust-libs { }; + behave = with python3Packages; toPythonApplication behave; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; bfetch = callPackage ../tools/misc/bfetch { }; From 32a3a0a14b3531c02f1d83a1a2c7326aca9b1564 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Oct 2022 18:51:40 +0200 Subject: [PATCH 36/36] python3Packages.tempest: Use buildPythonPackage --- pkgs/development/python-modules/tempest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 7f50fc8f3023..654c8a9e2ab0 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , pbr , cliff @@ -26,7 +26,7 @@ , python }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "tempest"; version = "32.0.0";