From c09e1828a4a6a4b43bed6ae3a3b3444df0e69f1c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 7 Jan 2024 15:45:38 +0100
Subject: python311Packages.python-openzwave: rename from python_openzwave

---
 .../python-modules/python-openzwave/cython.patch   | 20 ++++++++++
 .../python-modules/python-openzwave/default.nix    | 44 ++++++++++++++++++++++
 .../python-modules/python_openzwave/cython.patch   | 20 ----------
 .../python-modules/python_openzwave/default.nix    | 43 ---------------------
 pkgs/top-level/python-aliases.nix                  |  1 +
 pkgs/top-level/python-packages.nix                 |  2 +-
 6 files changed, 66 insertions(+), 64 deletions(-)
 create mode 100644 pkgs/development/python-modules/python-openzwave/cython.patch
 create mode 100644 pkgs/development/python-modules/python-openzwave/default.nix
 delete mode 100644 pkgs/development/python-modules/python_openzwave/cython.patch
 delete mode 100644 pkgs/development/python-modules/python_openzwave/default.nix

(limited to 'pkgs')

diff --git a/pkgs/development/python-modules/python-openzwave/cython.patch b/pkgs/development/python-modules/python-openzwave/cython.patch
new file mode 100644
index 000000000000..e01ffdbdc0d0
--- /dev/null
+++ b/pkgs/development/python-modules/python-openzwave/cython.patch
@@ -0,0 +1,20 @@
+diff --git a/pyozw_setup.py b/pyozw_setup.py
+index b201840..37bf2a8 100644
+--- a/pyozw_setup.py
++++ b/pyozw_setup.py
+@@ -257,13 +257,13 @@ class Template(object):
+         if sys.platform.startswith("win"):
+             return ['Cython']
+         else:
+-            return ['Cython==0.28.6']
++            return ['Cython>=0.28.6']
+ 
+     def build_requires(self):
+         if sys.platform.startswith("win"):
+             return ['Cython']
+         else:
+-            return ['Cython==0.28.6']
++            return ['Cython>=0.28.6']
+ 
+     def build(self):
+         if len(self.ctx['extra_objects']) == 1 and os.path.isfile(self.ctx['extra_objects'][0]):
diff --git a/pkgs/development/python-modules/python-openzwave/default.nix b/pkgs/development/python-modules/python-openzwave/default.nix
new file mode 100644
index 000000000000..4611039e34d9
--- /dev/null
+++ b/pkgs/development/python-modules/python-openzwave/default.nix
@@ -0,0 +1,44 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, pkg-config
+, systemd, libyaml, openzwave, cython, pyserial
+, six, pydispatcher, urwid }:
+
+buildPythonPackage rec {
+  pname = "python-openzwave";
+  version = "0.4.19";
+  format = "setuptools";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    pname = "python_openzwave";
+    inherit version;
+    sha256 = "6b40c7711383eeb3535cf5504f1cf47cc1ac7018eb820f299642a5a2795aef84";
+    extension = "zip";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ systemd libyaml openzwave cython ];
+  propagatedBuildInputs = [ six urwid pydispatcher pyserial ];
+
+  # primary location for the .xml files is in /etc/openzwave so we override the
+  # /usr/local/etc lookup instead as that allows us to dump new .xml files into
+  # /etc/openzwave if needed
+  postPatch = ''
+    substituteInPlace src-lib/libopenzwave/libopenzwave.pyx \
+      --replace /usr/local/etc/openzwave ${openzwave}/etc/openzwave
+  '';
+
+  patches = [ ./cython.patch ];
+
+  # no tests available
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python wrapper for the OpenZWave C++ library";
+    homepage = "https://github.com/OpenZWave/python-openzwave";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ ];
+    inherit (openzwave.meta) platforms;
+  };
+}
diff --git a/pkgs/development/python-modules/python_openzwave/cython.patch b/pkgs/development/python-modules/python_openzwave/cython.patch
deleted file mode 100644
index e01ffdbdc0d0..000000000000
--- a/pkgs/development/python-modules/python_openzwave/cython.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/pyozw_setup.py b/pyozw_setup.py
-index b201840..37bf2a8 100644
---- a/pyozw_setup.py
-+++ b/pyozw_setup.py
-@@ -257,13 +257,13 @@ class Template(object):
-         if sys.platform.startswith("win"):
-             return ['Cython']
-         else:
--            return ['Cython==0.28.6']
-+            return ['Cython>=0.28.6']
- 
-     def build_requires(self):
-         if sys.platform.startswith("win"):
-             return ['Cython']
-         else:
--            return ['Cython==0.28.6']
-+            return ['Cython>=0.28.6']
- 
-     def build(self):
-         if len(self.ctx['extra_objects']) == 1 and os.path.isfile(self.ctx['extra_objects'][0]):
diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix
deleted file mode 100644
index dbd9c3d8c469..000000000000
--- a/pkgs/development/python-modules/python_openzwave/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
-, pkg-config
-, systemd, libyaml, openzwave, cython, pyserial
-, six, pydispatcher, urwid }:
-
-buildPythonPackage rec {
-  pname = "python_openzwave";
-  version = "0.4.19";
-  format = "setuptools";
-
-  disabled = !isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6b40c7711383eeb3535cf5504f1cf47cc1ac7018eb820f299642a5a2795aef84";
-    extension = "zip";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ systemd libyaml openzwave cython ];
-  propagatedBuildInputs = [ six urwid pydispatcher pyserial ];
-
-  # primary location for the .xml files is in /etc/openzwave so we override the
-  # /usr/local/etc lookup instead as that allows us to dump new .xml files into
-  # /etc/openzwave if needed
-  postPatch = ''
-    substituteInPlace src-lib/libopenzwave/libopenzwave.pyx \
-      --replace /usr/local/etc/openzwave ${openzwave}/etc/openzwave
-  '';
-
-  patches = [ ./cython.patch ];
-
-  # no tests available
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Python wrapper for the OpenZWave C++ library";
-    homepage = "https://github.com/OpenZWave/python-openzwave";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
-    inherit (openzwave.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 86f10c04908e..7fc58c2b51f0 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -374,6 +374,7 @@ mapAliases ({
   pytestrunner = pytest-runner; # added 2021-01-04
   python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05
   python-igraph = igraph; # added 2021-11-11
+  python_openzwave = python-openzwave; # added 2024-01-07
   python-openzwave-mqtt = throw "python-openzwave was removed, as it was packaged as a dependency of home-assistant, which it is no longer."; # added 2024-01-05
   python_docs_theme = python-docs-theme; # added 2023-11-04
   python_fedora = python-fedora; # added 2023-11-15
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73ace0d799d5..0f2b13d7ec55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11801,7 +11801,7 @@ self: super: with self; {
 
   python-openstackclient = callPackage ../development/python-modules/python-openstackclient { };
 
-  python_openzwave = callPackage ../development/python-modules/python_openzwave { };
+  python-openzwave = callPackage ../development/python-modules/python-openzwave { };
 
   python-osc = callPackage ../development/python-modules/python-osc { };
 
-- 
cgit 1.4.1