From 8fb03d916b0ca1f8db534a416614c48da305c482 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 16 Feb 2025 11:44:10 +0100 Subject: [PATCH 1/3] python312Packages.napari-console: 0.0.9 -> 0.1.3 Diff: https://github.com/napari/napari-console/compare/refs/tags/v0.0.9...v0.1.3 --- .../python-modules/napari-console/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index de39909b2b93..f69b410f5a62 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -2,29 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies ipykernel, ipython, - pythonOlder, qtconsole, qtpy, - setuptools-scm, }: buildPythonPackage rec { pname = "napari-console"; - version = "0.0.9"; + version = "0.1.3"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "napari"; repo = "napari-console"; tag = "v${version}"; - hash = "sha256-3gOfiPx06G5c4eaLQ5kP45hUr6yw91esznJFacpO66Q="; + hash = "sha256-Hvo9YMDf7CjeGn1kT7m9Y5klH0cD/SWxDQOHkYspGpQ="; }; - build-system = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ ipykernel @@ -36,12 +41,10 @@ buildPythonPackage rec { # Circular dependency: napari doCheck = false; - pythonImportsCheck = [ "napari_console" ]; - - meta = with lib; { + meta = { description = "Plugin that adds a console to napari"; homepage = "https://github.com/napari/napari-console"; - license = licenses.bsd3; - maintainers = with maintainers; [ SomeoneSerge ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ SomeoneSerge ]; }; } From aaf1eed950fdb4008cc173a987786810b89f16b5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 16 Feb 2025 11:45:56 +0100 Subject: [PATCH 2/3] python312Packages.napari: 0.5.5 -> 0.5.6 Diff: https://github.com/napari/napari/compare/refs/tags/v0.5.5...v0.5.6 Changelog: https://github.com/napari/napari/releases/tag/v0.5.6 --- .../python-modules/napari/default.nix | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 58518cab487f..e68941e7d37d 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -1,17 +1,26 @@ { lib, + mkDerivationWith, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # nativeBuildInputs + wrapQtAppsHook, + + # dependencies app-model, appdirs, - buildPythonPackage, cachey, certifi, dask, docstring-parser, - fetchFromGitHub, imageio, jsonschema, magicgui, - mkDerivationWith, napari-console, napari-npe2, napari-svg, @@ -22,34 +31,28 @@ psutil, pydantic, pyopengl, - pythonOlder, pyyaml, scikit-image, scipy, - setuptools, - setuptools-scm, superqt, tifffile, toolz, tqdm, typing-extensions, vispy, - wrapQtAppsHook, wrapt, }: mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "napari"; repo = "napari"; tag = "v${version}"; - hash = "sha256-lNBmW1pzPzgAbMLb2XaIOIa/oNDvHAe+vAP1RKWoNxM="; + hash = "sha256-nMGqsgE3IXyC8lcM9+3U7ytEgDeYsFEbkgByHI4xI0E="; }; postPatch = '' @@ -64,7 +67,7 @@ mkDerivationWith buildPythonPackage rec { nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ + dependencies = [ app-model appdirs cachey @@ -102,11 +105,11 @@ mkDerivationWith buildPythonPackage rec { wrapQtApp $out/bin/napari ''; - meta = with lib; { + meta = { description = "Fast, interactive, multi-dimensional image viewer"; homepage = "https://github.com/napari/napari"; - changelog = "https://github.com/napari/napari/releases/tag/${src.tag}"; - license = licenses.bsd3; - maintainers = with maintainers; [ SomeoneSerge ]; + changelog = "https://github.com/napari/napari/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ SomeoneSerge ]; }; } From d6e2920b73cb5662d66c4c0e66db3411bf423465 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 16 Feb 2025 11:48:50 +0100 Subject: [PATCH 3/3] python312Packages.napari-svg: 0.1.10 -> 0.2.1 Diff: https://github.com/napari/napari-svg/compare/refs/tags/v0.1.10...v0.2.1 Changelog: https://github.com/napari/napari-svg/releases/tag/v0.2.1 --- .../python-modules/napari-svg/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/napari-svg/default.nix b/pkgs/development/python-modules/napari-svg/default.nix index af15f509cc93..8f3a0310da73 100644 --- a/pkgs/development/python-modules/napari-svg/default.nix +++ b/pkgs/development/python-modules/napari-svg/default.nix @@ -2,31 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + setuptools-scm, imageio, napari-plugin-engine, numpy, - pythonOlder, - setuptools-scm, vispy, }: buildPythonPackage rec { pname = "napari-svg"; - version = "0.1.10"; + version = "0.2.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "napari"; repo = "napari-svg"; tag = "v${version}"; - hash = "sha256-ywN9lUwBFW8zP7ivP7MNTYFbTCcmaZxAuKr056uY68Q="; + hash = "sha256-m3lm+jXUuGr9WCxzo7VyZNcKadLPX2VrCC9obiSvreQ="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ imageio napari-plugin-engine numpy @@ -36,11 +37,11 @@ buildPythonPackage rec { # Circular dependency: napari doCheck = false; - meta = with lib; { + meta = { description = "Plugin for writing svg files from napari"; homepage = "https://github.com/napari/napari-svg"; changelog = "https://github.com/napari/napari-svg/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ SomeoneSerge ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ SomeoneSerge ]; }; }