From 607930d95e1b287937c884ff1132089ed9894a59 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 31 Oct 2021 02:16:23 +0300 Subject: [PATCH 1/9] maintainers: add SomeoneSerge --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 40c117f2c185..6a00233aeeb2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11037,6 +11037,13 @@ githubId = 26806; name = "Scott Olson"; }; + SomeoneSerge = { + email = "sergei.kozlukov@aalto.fi"; + matrix = "@ss:someonex.net"; + github = "SomeoneSerge"; + githubId = 9720532; + name = "Sergei K"; + }; sondr3 = { email = "nilsen.sondre@gmail.com"; github = "sondr3"; From 15423f6249e0731e82b9b7ae198f20def96b14b2 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 31 Oct 2021 02:19:44 +0300 Subject: [PATCH 2/9] python3Packages.cachey: init at 0.2.1 --- .../python-modules/cachey/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/cachey/default.nix diff --git a/pkgs/development/python-modules/cachey/default.nix b/pkgs/development/python-modules/cachey/default.nix new file mode 100644 index 000000000000..aff819adcad8 --- /dev/null +++ b/pkgs/development/python-modules/cachey/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, typing-extensions +, heapdict +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { + pname = "cachey"; + version = "0.2.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { + owner = "dask"; + repo = pname; + rev = version; + sha256 = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s="; + }; + propagatedBuildInputs = [ typing-extensions heapdict ]; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "cachey" + ]; + meta = with lib; { + description = "Caching based on computation time and storage space"; + homepage = "https://github.com/dask/cachey/"; + license = licenses.bsd3; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8a2a6f0d8b9..57099c051686 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1396,6 +1396,8 @@ in { cachetools = callPackage ../development/python-modules/cachetools { }; + cachey = callPackage ../development/python-modules/cachey { }; + cachy = callPackage ../development/python-modules/cachy { }; cadquery = callPackage ../development/python-modules/cadquery { From eb293e3d2d632328f2f95a5975e3f6b778d2a2c6 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 19 Dec 2021 05:10:35 +0200 Subject: [PATCH 3/9] python3Packages.pytest-mypy-plugins: init at 1.9.2 --- .../pytest-mypy-plugins/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-mypy-plugins/default.nix diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix new file mode 100644 index 000000000000..38b2168e13fd --- /dev/null +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, chevron +, pyyaml +, mypy +, pytest +, decorator +, regex +}: + +buildPythonPackage rec { + pname = "pytest-mypy-plugins"; + version = "1.9.2"; + src = fetchFromGitHub { + owner = "typeddjango"; + repo = pname; + rev = version; + sha256 = "sha256-Me5P4Q2M+gGEWlUVgQ0L048rVUOlUzVMgZZcqZPeE4Q="; + }; + propagatedBuildInputs = [ chevron pyyaml mypy pytest decorator regex ]; + + meta = with lib; { + description = "pytest plugin for testing mypy types, stubs, and plugins"; + homepage = "https://github.com/TypedDjango/pytest-mypy-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57099c051686..999a91dbf150 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7633,6 +7633,8 @@ in { pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + pytest-mypy-plugins = callPackage ../development/python-modules/pytest-mypy-plugins { }; + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; pytest-order = callPackage ../development/python-modules/pytest-order { }; From 6c3069f4b4c7a554831de90d2875391ff4e273fe Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 19 Dec 2021 05:11:10 +0200 Subject: [PATCH 4/9] python3Packages.psygnal: import at 0.2.0 --- .../python-modules/psygnal/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/psygnal/default.nix diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix new file mode 100644 index 000000000000..da61f52fa0f8 --- /dev/null +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, wheel +, setuptools +, setuptools_scm +, pytestCheckHook +, pytest-mypy-plugins +, pytest-cov +, pytest +, mypy +, typing-extensions +}: buildPythonPackage rec +{ + pname = "psygnal"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "tlambert03"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-SiG2ywNEw3aNrRXyEMFTnvHKtKowO8yqoCaNI8PT4/Y="; + }; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ typing-extensions ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-mypy-plugins ]; + doCheck = false; # mypy checks are failing + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + meta = with lib; { + description = "Pure python implementation of Qt Signals"; + homepage = "https://github.com/tlambert03/psygnal"; + license = licenses.bsd3; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 999a91dbf150..f575dc6e3e60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6285,6 +6285,8 @@ in { psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { }; + psygnal = callPackage ../development/python-modules/psygnal { }; + ptable = callPackage ../development/python-modules/ptable { }; ptest = callPackage ../development/python-modules/ptest { }; From a14d6f593682f3707f4714c95642ad8446f48894 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 19 Dec 2021 05:26:11 +0200 Subject: [PATCH 5/9] python3Packages.docstring-parser: init at 0.12 --- .../docstring-parser/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/docstring-parser/default.nix diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix new file mode 100644 index 000000000000..d2b8e1c7c01a --- /dev/null +++ b/pkgs/development/python-modules/docstring-parser/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools_scm +, wheel +, pytest +}: buildPythonPackage rec { + pname = "docstring-parser"; + version = "0.12"; + src = fetchFromGitHub { + owner = "rr-"; + repo = "docstring_parser"; + rev = "${version}"; + sha256 = "sha256-hQuPJQrGvDs4dJrMLSR4sSnqy45xrF2ufinBG+azuCg="; + }; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pytest setuptools wheel ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + meta = with lib; { + description = "Parse Python docstrings in various flavors. "; + homepage = "https://github.com/rr-/docstring_parser"; + license = licenses.mit; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f575dc6e3e60..3a8232fe08db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2351,6 +2351,8 @@ in { docstring-to-markdown = callPackage ../development/python-modules/docstring-to-markdown { }; + docstring-parser = callPackage ../development/python-modules/docstring-parser { }; + docopt = callPackage ../development/python-modules/docopt { }; docopt-ng = callPackage ../development/python-modules/docopt-ng { }; From 9b1433321389be468bd8f986dc63943a8e1834cd Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 19 Dec 2021 05:59:15 +0200 Subject: [PATCH 6/9] python3Packages.superqt: init at 0.2.5-1 --- .../docstring-parser/default.nix | 3 +- .../python-modules/superqt/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/superqt/default.nix diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix index d2b8e1c7c01a..2cce5e56b1e4 100644 --- a/pkgs/development/python-modules/docstring-parser/default.nix +++ b/pkgs/development/python-modules/docstring-parser/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub , setuptools , setuptools_scm diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix new file mode 100644 index 000000000000..b6d800d00d2b --- /dev/null +++ b/pkgs/development/python-modules/superqt/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools_scm +, pyqt5 +, typing-extensions +, pytest +, pytestCheckHook +}: buildPythonPackage rec { + pname = "superqt"; + version = "0.2.5-1"; + src = fetchFromGitHub { + owner = "napari"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-rkTiCJ8mIogS9SDmLPiaAyhhuBx3kk6rXjCc19zbwiM="; + }; + format = "pyproject"; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pyqt5 typing-extensions ]; + checkInputs = [ pytestCheckHook pytest ]; + doCheck = false; # Segfaults... + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + meta = with lib; { + description = "Missing widgets and components for Qt-python (napari/superqt)"; + homepage = "https://github.com/napari/superqt"; + license = licenses.bsd3; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a8232fe08db..49de43eee887 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9369,6 +9369,8 @@ in { supervisor = callPackage ../development/python-modules/supervisor { }; + superqt = callPackage ../development/python-modules/superqt { }; + sure = callPackage ../development/python-modules/sure { }; surepy = callPackage ../development/python-modules/surepy { }; From 3fa7d0a2d2e84f6617280e0ee22fd1f5a4aacbaa Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 19 Dec 2021 06:14:08 +0200 Subject: [PATCH 7/9] python3Packages.magicgui: init at 0.3.0 --- .../python-modules/magicgui/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/magicgui/default.nix diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix new file mode 100644 index 000000000000..4357b9462716 --- /dev/null +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools_scm +, pytestCheckHook +, pytest-mypy-plugins +, typing-extensions +, qtpy +, pyside2 +, psygnal +, docstring-parser +}: buildPythonPackage rec { + pname = "magicgui"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "napari"; + repo = "magicgui"; + rev = "v${version}"; + sha256 = "sha256-DvL1szk2RoCrpisjp0BVNL6qFZtYc2oYDenX59Cxbug="; + }; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; + checkInputs = [ pytestCheckHook pytest-mypy-plugins ]; + doCheck = false; # Reports "Fatal Python error" + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + meta = with lib; { + description = "Build GUIs from python functions, using magic. (napari/magicgui)"; + homepage = "https://github.com/napari/magicgui"; + license = licenses.mit; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49de43eee887..b9f7df414d6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4733,6 +4733,8 @@ in { magic = callPackage ../development/python-modules/magic { }; + magicgui = callPackage ../development/python-modules/magicgui { }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; From 1805df99eaa49ec806793b882babd878f32106f9 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 19 Dec 2021 06:46:58 +0200 Subject: [PATCH 8/9] napari: init at 0.4.12 napari: a fast, interactive, multi-dimensional image viewer for python Separately packaged components: - init python3Packages.napari-plugin-engine at 0.2.0 - init python3Packages.napari-console at 0.0.4 - init python3Packages.napari-svg at 0.1.5 --- .../python-modules/napari-console/default.nix | 33 ++++++++ .../napari-plugin-engine/default.nix | 26 +++++++ .../python-modules/napari-svg/default.nix | 30 ++++++++ .../python-modules/napari/default.nix | 75 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 10 +++ 6 files changed, 176 insertions(+) create mode 100644 pkgs/development/python-modules/napari-console/default.nix create mode 100644 pkgs/development/python-modules/napari-plugin-engine/default.nix create mode 100644 pkgs/development/python-modules/napari-svg/default.nix create mode 100644 pkgs/development/python-modules/napari/default.nix diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix new file mode 100644 index 000000000000..214553a9821e --- /dev/null +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools_scm +, pytestCheckHook +, pytest +, ipython +, ipykernel +, qtconsole +, napari-plugin-engine +, imageio +}: buildPythonPackage rec { + pname = "napari-console"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "napari"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aVdYOzkZ+dqB680oDjNCg6quXU+QgUZI09E/MSTagyA="; + }; + nativeBuildInputs = [ setuptools_scm ]; + # setup.py somehow requires pytest + propagatedBuildInputs = [ pytest ipython ipykernel napari-plugin-engine imageio qtconsole ]; + chechInputs = [ pytestCheckHook ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + meta = with lib; { + description = "A plugin that adds a console to napari"; + homepage = "https://github.com/napari/napari-console"; + license = licenses.bsd3; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix new file mode 100644 index 000000000000..a722786fb2fc --- /dev/null +++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools_scm +, pytestCheckHook +}: buildPythonPackage rec { + pname = "napari-plugin-engine"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "napari"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE="; + }; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytestCheckHook ]; + doCheck = false; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + meta = with lib; { + description = "A fork of pluggy for napari - plugin management package"; + homepage = "https://github.com/napari/napari-plugin-engine"; + license = licenses.mit; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/development/python-modules/napari-svg/default.nix b/pkgs/development/python-modules/napari-svg/default.nix new file mode 100644 index 000000000000..4df71b01084b --- /dev/null +++ b/pkgs/development/python-modules/napari-svg/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools_scm +, pytestCheckHook +, vispy +, napari-plugin-engine +, imageio +}: buildPythonPackage rec { + pname = "napari-svg"; + version = "0.1.5"; + src = fetchFromGitHub { + owner = "napari"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-20NLi6JTugP+hxqF2AnhSkuvhkGGbeG+tT3M2SZbtRc="; + }; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ vispy napari-plugin-engine imageio ]; + checkInputs = [ pytestCheckHook ]; + doCheck = false; # Circular dependency: napari + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + meta = with lib; { + description = "A plugin for writing svg files from napari"; + homepage = "https://github.com/napari/napari-svg"; + license = licenses.bsd3; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix new file mode 100644 index 000000000000..7cad250e1f6b --- /dev/null +++ b/pkgs/development/python-modules/napari/default.nix @@ -0,0 +1,75 @@ +{ lib +, mkDerivationWith +, buildPythonPackage +, fetchFromGitHub +, setuptools_scm +, superqt +, typing-extensions +, tifffile +, napari-plugin-engine +, pint +, pyyaml +, numpydoc +, dask +, magicgui +, docstring-parser +, appdirs +, imageio +, pyopengl +, cachey +, napari-svg +, psutil +, napari-console +, wrapt +, pydantic +, tqdm +, jsonschema +, scipy +, wrapQtAppsHook +}: mkDerivationWith buildPythonPackage rec { + pname = "napari"; + version = "0.4.12"; + src = fetchFromGitHub { + owner = "napari"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0QSI0mgDjF70/X58fE7uWwlBUCGY5gsvbCm4oJkp2Yk="; + }; + nativeBuildInputs = [ setuptools_scm wrapQtAppsHook ]; + propagatedBuildInputs = [ + napari-plugin-engine + cachey + napari-svg + napari-console + superqt + magicgui + typing-extensions + tifffile + pint + pyyaml + numpydoc + dask + docstring-parser + appdirs + imageio + pyopengl + psutil + wrapt + pydantic + tqdm + jsonschema + scipy + ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + dontUseSetuptoolsCheck = true; + postFixup = '' + wrapQtApp $out/bin/napari + ''; + + meta = with lib; { + description = "A fast, interactive, multi-dimensional image viewer for python"; + homepage = "https://github.com/napari/napari"; + license = licenses.bsd3; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76b8467a442f..707173f9781d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30110,6 +30110,8 @@ with pkgs; masari = callPackage ../applications/blockchains/masari { boost = boost165; }; + napari = with python3Packages; toPythonApplication napari; + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { boost = boost172; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9f7df414d6b..14c0df05c5f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5208,6 +5208,16 @@ in { nanotime = callPackage ../development/python-modules/nanotime { }; + napari = callPackage ../development/python-modules/napari { + inherit (pkgs.libsForQt5) mkDerivationWith wrapQtAppsHook; + }; + + napari-console = callPackage ../development/python-modules/napari-console { }; + + napari-plugin-engine = callPackage ../development/python-modules/napari-plugin-engine { }; + + napari-svg = callPackage ../development/python-modules/napari-svg { }; + nassl = callPackage ../development/python-modules/nassl { }; nats-python = callPackage ../development/python-modules/nats-python { }; From d0e4af844e2d5d6da8bf9d754f1e750d4a1ecedf Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 21 Dec 2021 00:09:35 +0200 Subject: [PATCH 9/9] napari&deps: rename setuptools_scm setuptools-scm --- pkgs/development/python-modules/docstring-parser/default.nix | 4 ++-- pkgs/development/python-modules/magicgui/default.nix | 4 ++-- pkgs/development/python-modules/napari-console/default.nix | 4 ++-- .../python-modules/napari-plugin-engine/default.nix | 4 ++-- pkgs/development/python-modules/napari-svg/default.nix | 4 ++-- pkgs/development/python-modules/napari/default.nix | 4 ++-- pkgs/development/python-modules/psygnal/default.nix | 4 ++-- pkgs/development/python-modules/superqt/default.nix | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix index 2cce5e56b1e4..5408b11c7d8a 100644 --- a/pkgs/development/python-modules/docstring-parser/default.nix +++ b/pkgs/development/python-modules/docstring-parser/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools -, setuptools_scm +, setuptools-scm , wheel , pytest }: buildPythonPackage rec { @@ -14,7 +14,7 @@ rev = "${version}"; sha256 = "sha256-hQuPJQrGvDs4dJrMLSR4sSnqy45xrF2ufinBG+azuCg="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pytest setuptools wheel ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index 4357b9462716..03ca9d791597 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest-mypy-plugins , typing-extensions @@ -18,7 +18,7 @@ rev = "v${version}"; sha256 = "sha256-DvL1szk2RoCrpisjp0BVNL6qFZtYc2oYDenX59Cxbug="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; checkInputs = [ pytestCheckHook pytest-mypy-plugins ]; doCheck = false; # Reports "Fatal Python error" diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index 214553a9821e..f809587f75f2 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest , ipython @@ -18,7 +18,7 @@ rev = "v${version}"; sha256 = "sha256-aVdYOzkZ+dqB680oDjNCg6quXU+QgUZI09E/MSTagyA="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; # setup.py somehow requires pytest propagatedBuildInputs = [ pytest ipython ipykernel napari-plugin-engine imageio qtconsole ]; chechInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix index a722786fb2fc..802b25e8df14 100644 --- a/pkgs/development/python-modules/napari-plugin-engine/default.nix +++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pytestCheckHook }: buildPythonPackage rec { pname = "napari-plugin-engine"; @@ -12,7 +12,7 @@ rev = "v${version}"; sha256 = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook ]; doCheck = false; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/napari-svg/default.nix b/pkgs/development/python-modules/napari-svg/default.nix index 4df71b01084b..89101e824445 100644 --- a/pkgs/development/python-modules/napari-svg/default.nix +++ b/pkgs/development/python-modules/napari-svg/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pytestCheckHook , vispy , napari-plugin-engine @@ -15,7 +15,7 @@ rev = "v${version}"; sha256 = "sha256-20NLi6JTugP+hxqF2AnhSkuvhkGGbeG+tT3M2SZbtRc="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ vispy napari-plugin-engine imageio ]; checkInputs = [ pytestCheckHook ]; doCheck = false; # Circular dependency: napari diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 7cad250e1f6b..74936da4f725 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -2,7 +2,7 @@ , mkDerivationWith , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , superqt , typing-extensions , tifffile @@ -35,7 +35,7 @@ rev = "v${version}"; sha256 = "sha256-0QSI0mgDjF70/X58fE7uWwlBUCGY5gsvbCm4oJkp2Yk="; }; - nativeBuildInputs = [ setuptools_scm wrapQtAppsHook ]; + nativeBuildInputs = [ setuptools-scm wrapQtAppsHook ]; propagatedBuildInputs = [ napari-plugin-engine cachey diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index da61f52fa0f8..6ac20798e0c0 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , wheel , setuptools -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest-mypy-plugins , pytest-cov @@ -20,7 +20,7 @@ rev = "v${version}"; sha256 = "sha256-SiG2ywNEw3aNrRXyEMFTnvHKtKowO8yqoCaNI8PT4/Y="; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions ]; checkInputs = [ pytestCheckHook pytest-cov pytest-mypy-plugins ]; doCheck = false; # mypy checks are failing diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index b6d800d00d2b..9890a7000a9a 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools_scm +, setuptools-scm , pyqt5 , typing-extensions , pytest @@ -16,7 +16,7 @@ sha256 = "sha256-rkTiCJ8mIogS9SDmLPiaAyhhuBx3kk6rXjCc19zbwiM="; }; format = "pyproject"; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pyqt5 typing-extensions ]; checkInputs = [ pytestCheckHook pytest ]; doCheck = false; # Segfaults...