diff options
| author | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-01-23 20:09:53 -0300 |
|---|---|---|
| committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-01-23 20:14:06 -0300 |
| commit | 26017cf53660833e6c7124f60a17be44ca295294 (patch) | |
| tree | 6caa05e3c6b6efb14e40dc576bfc2d764840141a | |
| parent | f1778cd90eea2c3d5dbca3aa55b6351697dad683 (diff) | |
| download | nixpkgs-26017cf53660833e6c7124f60a17be44ca295294.tar nixpkgs-26017cf53660833e6c7124f60a17be44ca295294.tar.gz nixpkgs-26017cf53660833e6c7124f60a17be44ca295294.tar.bz2 nixpkgs-26017cf53660833e6c7124f60a17be44ca295294.tar.lz nixpkgs-26017cf53660833e6c7124f60a17be44ca295294.tar.xz nixpkgs-26017cf53660833e6c7124f60a17be44ca295294.tar.zst nixpkgs-26017cf53660833e6c7124f60a17be44ca295294.zip | |
pyspread: add desktop item
Also, remove "spurious" pyspread package.
| -rw-r--r-- | pkgs/applications/office/pyspread/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyspread/default.nix | 56 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 18 insertions, 58 deletions
diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix index 5b7a80747d0..0b657e38f7f 100644 --- a/pkgs/applications/office/pyspread/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix deleted file mode 100644 index a14911b7a3e..00000000000 --- a/pkgs/development/python-modules/pyspread/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d37d837e4e1..d69502ace2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/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 { |