@@ -1,31 +1,22 @@
11{ lib
2−, python3
3−, fetchpatch
2+, copyDesktopItems
43, makeDesktopItem
4+, python3
55, qtsvg
66, wrapQtAppsHook
77}:
88
99python3.pkgs.buildPythonApplication rec {
1010 pname = "pyspread";
11− version = "1.99.6";
11+ version = "2.0.2";
1212
1313 src = python3.pkgs.fetchPypi {
1414 inherit pname version;
15− sha256 = "sha256-B1oyWUAXn63mmVFN9brJwbHxi7I5nYrK2JJU1DjAlb8=";
15+ hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8=";
1616 };
1717
18− patches = [
19− # https://gitlab.com/pyspread/pyspread/-/merge_requests/34
20− (fetchpatch {
21− name = "entry-points.patch";
22− url = "https://gitlab.com/pyspread/pyspread/-/commit/3d8da6a7a7d76f7027d77ca95fac103961d729a2.patch";
23− excludes = [ "bin/pyspread" "bin/pyspread.bat" ];
24− sha256 = "1l614k7agv339hrin23jj7s1mq576vkdfkdim6wp224k7y37bnil";
25− })
26− ];
27−
2818 nativeBuildInputs = [
19+ copyDesktopItems
2920 wrapQtAppsHook
3021 ];
3122
@@ -47,19 +38,17 @@ python3.pkgs.buildPythonApplication rec {
4738
4839 pythonImportsCheck = [ "pyspread" ];
4940
50− desktopItem = makeDesktopItem rec {
51− name = pname;
52− exec = name;
53− icon = name;
54− desktopName = "Pyspread";
55− genericName = "Spreadsheet";
56− comment = meta.description;
57− categories = "Office;Development;Spreadsheet;";
58− };
59−
60− postInstall = ''
61− install -m 444 -Dt $out/share/applications ${desktopItem}/share/applications/*
62− '';
41+ desktopItems = [
42+ (makeDesktopItem rec {
43+ name = pname;
44+ exec = name;
45+ icon = name;
46+ desktopName = "Pyspread";
47+ genericName = "Spreadsheet";
48+ comment = meta.description;
49+ categories = "Office;Development;Spreadsheet;";
50+ })
51+ ];
6352
6453 preFixup = ''
6554 makeWrapperArgs+=("''${qtWrapperArgs[@]}")