bump vidhar

3 files changed, 31 insertions, 51 deletions

diff --git a/overlays/smartprom/default.nix b/overlays/smartprom/default.nix
index 35e94608..eaeb080d 100644
--- a/overlays/smartprom/default.nix
+++ b/overlays/smartprom/default.nix
@@ -1,23 +1,28 @@
-{ prev, sources, ... }:
+{ prev, final, sources, flakeInputs, ... }:
 {
-  smartprom =
-    with prev.poetry2nix;
-    mkPoetryApplication {
-      inherit (sources.smartprom) pname version;
-      projectDir = cleanPythonSources {
-        src = prev.runCommand "sources" {} ''
-          mkdir $out
-          cp -r ${sources.smartprom.src}/. $out
+  smartprom = let
+    project = flakeInputs.pyproject-nix.lib.project.loadRequirementsTxt {
+      projectRoot = sources.smartprom.src;
+    };
+    python = final.python3;
+  in python.pkgs.buildPythonApplication {
+    pname = "smartprom";
+    version = "2.3.0";
 
-          mkdir $out/smartprom
-          mv $out/megaraid.py $out/smartprom
-          mv $out/smartprom.py $out/smartprom/__main__.py
-          sed -ri 's/import megaraid/from . import megaraid/' $out/smartprom/__main__.py
-          echo >> $out/smartprom/__init__.py
+    src = prev.runCommand "sources" {} ''
+      mkdir $out
+      cp -r ${sources.smartprom.src}/. $out
 
-          cp ${./pyproject.toml} $out/pyproject.toml
-          cp ${./poetry.lock} $out/poetry.lock
-        '';
-      };
-    };
+      mkdir $out/smartprom
+      mv $out/megaraid.py $out/smartprom
+      mv $out/smartprom.py $out/smartprom/__main__.py
+      sed -ri 's/import megaraid/from . import megaraid/' $out/smartprom/__main__.py
+      echo >> $out/smartprom/__init__.py
+
+      cp ${./pyproject.toml} $out/pyproject.toml
+    '';
+
+    pyproject = true;
+    propagatedBuildInputs = (project.renderers.withPackages { inherit python; }) python.pkgs;
+  };
 }
diff --git a/overlays/smartprom/poetry.lock b/overlays/smartprom/poetry.lock
deleted file mode 100644
index de8be1f8..00000000
--- a/overlays/smartprom/poetry.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is automatically @generated by Poetry and should not be changed by hand.
-
-[[package]]
-name = "prometheus-client"
-version = "0.16.0"
-description = "Python client for the Prometheus monitoring system."
-category = "main"
-optional = false
-python-versions = ">=3.6"
-files = [
-    {file = "prometheus_client-0.16.0-py3-none-any.whl", hash = "sha256:0836af6eb2c8f4fed712b2f279f6c0a8bbab29f9f4aa15276b91c7cb0d1616ab"},
-    {file = "prometheus_client-0.16.0.tar.gz", hash = "sha256:a03e35b359f14dd1630898543e2120addfdeacd1a6069c1367ae90fd93ad3f48"},
-]
-
-[package.extras]
-twisted = ["twisted"]
-
-[metadata]
-lock-version = "2.0"
-python-versions = ">=3.10.0,<3.12"
-content-hash = "a84309056a73a8051b1c506324a43036ecfa6e4584882d2ec30ef1d6e030b1a1"
diff --git a/overlays/smartprom/pyproject.toml b/overlays/smartprom/pyproject.toml
index 8ca28f00..620efa1a 100644
--- a/overlays/smartprom/pyproject.toml
+++ b/overlays/smartprom/pyproject.toml
@@ -1,16 +1,12 @@
-[tool.poetry]
+[project]
 name = "smartprom"
 version = "2.3.0"
-authors = []
-description = ""
+dependencies = [
+    "prometheus-client"
+]
 
-[tool.poetry.scripts]
+[project.scripts]
 smartprom = "smartprom.__main__:main"
 
-[tool.poetry.dependencies]
-python = ">=3.10.0,<3.13"
-prometheus-client = "^0.16.0"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
\ No newline at end of file
+[tool.setuptools]
+packages = ["smartprom"]