From dbeb746d5519aadfc46762dd80eee62db0dc33d4 Mon Sep 17 00:00:00 2001
From: Merikei <73759842+Merikei@users.noreply.github.com>
Date: Fri, 28 Nov 2025 21:23:00 +0000
Subject: [PATCH] pyspread: fix dependencies

Co-authored-by: Yohann Boniface <edhyjox@gmail.com>
---
 pkgs/by-name/py/pyspread/package.nix | 39 ++++++++++++++++------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix
index 2a44490d8706..b1fb839f95df 100644
--- a/pkgs/by-name/py/pyspread/package.nix
+++ b/pkgs/by-name/py/pyspread/package.nix
@@ -2,17 +2,11 @@
   lib,
   python3Packages,
   fetchPypi,
+  qt6,
+  R,
   copyDesktopItems,
-  libsForQt5,
   makeDesktopItem,
 }:
-
-let
-  inherit (libsForQt5)
-    qtsvg
-    wrapQtAppsHook
-    ;
-in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyspread";
   version = "2.4";
@@ -26,21 +20,30 @@ python3Packages.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   nativeBuildInputs = [
+    R
     copyDesktopItems
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qtsvg
-  ];
+  buildInputs = [ qt6.qtsvg ];
 
   dependencies = with python3Packages; [
-    python-dateutil
-    markdown2
-    matplotlib
+    pyqt6
     numpy
-    pyenchant
-    pyqt5
+    markdown2
+
+    # Optional
+    matplotlib # data visualization
+    pyenchant # spellchecker bindings
+    pip # python package installer
+    python-dateutil # extensions to standard datetime module
+    rpy2 # interface to R
+    plotnine # data visualization
+    openpyxl # r/w Excel 2010 xlsx/xlsm files
+
+    # Optional & not in nixpkgs
+    #py-moneyed # currency & money classes
+    #pycel # compile Excel spreadsheets to Python code
   ];
 
   strictDeps = true;
@@ -64,6 +67,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
     })
   ];
 
+  makeWrapperArgs = [ "--set R_HOME ${lib.getLib R}/lib/R" ];
+
   preFixup = ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';