Merge pull request #110641 from AndersonTorres/new-pyspread

pyspread: add desktop item

pkgs/applications/office/pyspread/default.nix

@@ -1,6 +1,7 @@
 { lib
 , buildPythonApplication
 , fetchPypi
+, makeDesktopItem
 , makePythonPath
 , dateutil
 , matplotlib
@@ -38,6 +39,23 @@ buildPythonApplication rec {
 
   doCheck = false; # it fails miserably with a core dump
 
+  desktopItem = makeDesktopItem rec {
+    name = pname;
+    exec = name;
+    icon = name;
+    desktopName = "Pyspread";
+    genericName = "Spreadsheet";
+    comment = meta.description;
+    categories = "Office;Development;Spreadsheet;";
+  };
+
+  postInstall = ''
+    runHook preInstall
+    install -D $out/share/applications
+    install -m 644 $desktopItem/share/applications/* $out/share/applications
+    runHook postInstall
+  '';
+
   fixupPhase = ''
     runHook preFixup
     sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" $out/bin/pyspread

pkgs/development/python-modules/pyspread/default.nix

@@ -1,56 +0,0 @@
-{ buildPythonPackage
-, fetchPypi
-, isPy3k
-, lib, stdenv
-, numpy
-, wxPython
-, matplotlib
-, pycairo
-, python-gnupg
-, xlrd
-, xlwt
-, jedi
-, pyenchant
-, basemap
-, pygtk
-, makeDesktopItem
-}:
-
-buildPythonPackage rec {
-  pname = "pyspread";
-  version = "1.99.5";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "d396c2f94bf1ef6140877ab19205e6f2375bfe01d1bf50ff33bb63384744dd78";
-  };
-
-  propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
-  # Could also (optionally) add pyrsvg and python bindings for libvlc
-
-  # Tests try to access X Display
-  doCheck = false;
-
-  disabled = isPy3k;
-
-  desktopItem = makeDesktopItem rec {
-    name = pname;
-    exec = name;
-    icon = name;
-    desktopName = "Pyspread";
-    genericName = "Spreadsheet";
-    comment = meta.description;
-    categories = "Development;Spreadsheet;";
-  };
-
-  postInstall = ''
-    mkdir -p $out/share/applications
-    cp $desktopItem/share/applications/* $out/share/applications
-  '';
-
-  meta = with lib; {
-    description = "Pyspread is a non-traditional spreadsheet application that is based on and written in the programming language Python";
-    homepage = "https://manns.github.io/pyspread/";
-    license = licenses.gpl3;
-  };
-}

pkgs/top-level/python-packages.nix

@@ -5906,8 +5906,6 @@ in {
 
   pyspotify = callPackage ../development/python-modules/pyspotify { };
 
-  pyspread = callPackage ../development/python-modules/pyspread { };
-
   pysptk = callPackage ../development/python-modules/pysptk { };
 
   pysqlcipher3 = callPackage ../development/python-modules/pysqlcipher3 {