From 5df6a1bd2f89e8f040393e0e722de232a0458e99 Mon Sep 17 00:00:00 2001
From: Merikei <73759842+Merikei@users.noreply.github.com>
Date: Fri, 28 Nov 2025 20:45:59 +0000
Subject: [PATCH 1/4] maintainers: add Merikei

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 49a4cbcb7956..c79cba377258 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17325,6 +17325,11 @@
     github = "Mephistophiles";
     githubId = 4850908;
   };
+  Merikei = {
+    name = "Merikei";
+    github = "Merikei";
+    githubId = 73759842;
+  };
   merrkry = {
     email = "merrkry@tsubasa.moe";
     name = "merrkry";

From 6049787a7b42415efa76cb8895ac57d4f22d5431 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 25 Mar 2026 01:52:35 +0100
Subject: [PATCH 2/4] pyspread: add merikei to maintainers

---
 pkgs/by-name/py/pyspread/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix
index 3e19974c4fe4..72f41255827f 100644
--- a/pkgs/by-name/py/pyspread/package.nix
+++ b/pkgs/by-name/py/pyspread/package.nix
@@ -83,6 +83,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "pyspread";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ Merikei ];
   };
 })

From ef0107e328d4940a1930eec58522f235fd4c59bc Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 25 Mar 2026 01:56:27 +0100
Subject: [PATCH 3/4] pyspead: modernize

---
 pkgs/by-name/py/pyspread/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix
index 72f41255827f..2a44490d8706 100644
--- a/pkgs/by-name/py/pyspread/package.nix
+++ b/pkgs/by-name/py/pyspread/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchPypi,
   copyDesktopItems,
   libsForQt5,
@@ -13,16 +13,18 @@ let
     wrapQtAppsHook
     ;
 in
-python3.pkgs.buildPythonApplication (finalAttrs: {
-  format = "setuptools";
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyspread";
   version = "2.4";
+
   src = fetchPypi {
     pname = "pyspread";
     inherit (finalAttrs) version;
     hash = "sha256-MZlR2Rap5oMRfCmswg9W//FYFkSEki7eyMNhLoGZgJM=";
   };
 
+  pyproject = true;
+
   nativeBuildInputs = [
     copyDesktopItems
     wrapQtAppsHook
@@ -32,20 +34,18 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     qtsvg
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3Packages; [
     python-dateutil
     markdown2
     matplotlib
     numpy
     pyenchant
     pyqt5
-    setuptools
   ];
 
   strictDeps = true;
 
-  doCheck = false; # it fails miserably with a core dump
-
+  doCheck = true;
   pythonImportsCheck = [ "pyspread" ];
 
   desktopItems = [
@@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       icon = "pyspread";
       desktopName = "Pyspread";
       genericName = "Spreadsheet";
-      comment = "A Python-oriented spreadsheet application";
+      comment = "Python-oriented spreadsheet application";
       categories = [
         "Office"
         "Development"
@@ -84,5 +84,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "pyspread";
     maintainers = with lib.maintainers; [ Merikei ];
+    platforms = lib.platforms.linux;
   };
 })

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 4/4] 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[@]}")
   '';