python312Packages.napari*: update and fix (#382536)

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 ];
   };
 }

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 ];
   };
 }

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 ];
   };
 }