diff options
Diffstat (limited to 'pkgs/applications/office')
60 files changed, 146 insertions, 254 deletions
diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index 32c490b0af3dc..54105e7c71017 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -240,7 +240,7 @@ rec { ''; meta = with lib; { - description = "A web-based UI for ActivityWatch, built with Vue.js"; + description = "Web-based UI for ActivityWatch, built with Vue.js"; homepage = "https://github.com/ActivityWatch/aw-webui/"; maintainers = with maintainers; [ huantian ]; license = licenses.mpl20; diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index 8957df0bad194..8d06589cb4166 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS"; + description = "Simple, fast, no-nonsense to-do (task) list designed for elementary OS"; homepage = "https://github.com/dahenson/agenda"; maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 8db8b3fbb7919..62315b6c2ae58 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.5.7"; + version = "0.6.1"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-SVtAx/yllHugBys506pT/5n6IDEZvPEeCHRjFHLMZ0A="; + hash = "sha256-a8oupvBtT3sKhboSeS/GbVSauKXx54J4WZd+PyIbuzU="; stripRoot = false; }; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 54a070596dc6e..d6c4db65c1504 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An integrated family of CLI’s for various Atlassian applications"; + description = "Integrated family of CLI’s for various Atlassian applications"; homepage = "https://bobswift.atlassian.net/wiki/spaces/ACLI/overview"; license = licenses.unfreeRedistributable; sourceProvenance = with sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/applications/office/beancount/beancount_share.nix b/pkgs/applications/office/beancount/beancount_share.nix index 3b2ae6c4ddf02..19b49a2697ccf 100644 --- a/pkgs/applications/office/beancount/beancount_share.nix +++ b/pkgs/applications/office/beancount/beancount_share.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/akuukis/beancount_share"; - description = "A beancount plugin to share expenses with external partners within one ledger"; + description = "Beancount plugin to share expenses with external partners within one ledger"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/applications/office/beebeep/default.nix b/pkgs/applications/office/beebeep/default.nix index 978066b7199a8..63843433b3c54 100644 --- a/pkgs/applications/office/beebeep/default.nix +++ b/pkgs/applications/office/beebeep/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://www.beebeep.net/"; - description = "BeeBEEP is the free office messenger that is indispensable in all those places where privacy and security are an essential requirement."; + description = "BeeBEEP is the free office messenger that is indispensable in all those places where privacy and security are an essential requirement"; mainProgram = "beebeep"; platforms = platforms.linux; license = licenses.gpl2Only; diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index c64c3389d95d8..f35a0e515897a 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A simple, focused eBook reader"; + description = "Simple, focused eBook reader"; mainProgram = "com.github.babluboy.bookworm"; longDescription = '' Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 302419fdcefcf..611336b8a908e 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -77,7 +77,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A suite of productivity applications"; + description = "Suite of productivity applications"; longDescription = '' Calligra Suite is a set of applications written to help you to accomplish your work. Calligra includes efficient diff --git a/pkgs/applications/office/clockify/default.nix b/pkgs/applications/office/clockify/default.nix index 6acb243acec76..8bcd2785bc22c 100644 --- a/pkgs/applications/office/clockify/default.nix +++ b/pkgs/applications/office/clockify/default.nix @@ -25,7 +25,7 @@ appimageTools.wrapType2 rec { description = "Free time tracker and timesheet app that lets you track work hours across projects"; homepage = "https://clockify.me"; license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ ]; mainProgram = "clockify"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/office/cutemarked-ng/default.nix b/pkgs/applications/office/cutemarked-ng/default.nix index 79555fc2f1133..cd564199b0169 100644 --- a/pkgs/applications/office/cutemarked-ng/default.nix +++ b/pkgs/applications/office/cutemarked-ng/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A Qt-based, free and open source markdown editor"; + description = "Qt-based, free and open source markdown editor"; mainProgram = "cutemarked"; homepage = "https://github.com/Waqar144/CuteMarkEd-NG"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix index f8cd25ad78435..3f0544d56f6e9 100644 --- a/pkgs/applications/office/docear/default.nix +++ b/pkgs/applications/office/docear/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A unique solution to academic literature management"; + description = "Unique solution to academic literature management"; homepage = "http://www.docear.org/"; # Licenses at: http://www.docear.org/software/download/ license = with licenses; [ diff --git a/pkgs/applications/office/documenso/default.nix b/pkgs/applications/office/documenso/default.nix index e57e6d0fae215..cca2c86c55844 100644 --- a/pkgs/applications/office/documenso/default.nix +++ b/pkgs/applications/office/documenso/default.nix @@ -44,7 +44,7 @@ buildNpmPackage { passthru.updateScript = nix-update-script {}; meta = with lib; { - description = "The Open Source DocuSign Alternative."; + description = "Open Source DocuSign Alternative"; homepage = "https://github.com/documenso/documenso"; license = licenses.agpl3Only; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix index e1f915075b970..4cd888468eaf6 100644 --- a/pkgs/applications/office/foliate/default.nix +++ b/pkgs/applications/office/foliate/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A simple and modern GTK eBook reader"; + description = "Simple and modern GTK eBook reader"; homepage = "https://johnfactotum.github.io/foliate"; changelog = "https://github.com/johnfactotum/foliate/releases/tag/${version}"; license = licenses.gpl3Only; diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/applications/office/gnote/default.nix index a4262de9937f7..6a77eb0534a66 100644 --- a/pkgs/applications/office/gnote/default.nix +++ b/pkgs/applications/office/gnote/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnote"; - description = "A note taking application"; + description = "Note taking application"; mainProgram = "gnote"; maintainers = with maintainers; [ jfvillablanca ]; license = licenses.gpl3Only; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index a3c16d5d86fe1..d9b376a1962e7 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { }; meta = with lib; { - description = "The GNOME Office Spreadsheet"; + description = "GNOME Office Spreadsheet"; license = lib.licenses.gpl2Plus; homepage = "http://projects.gnome.org/gnumeric/"; platforms = platforms.unix; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 586777ccf41e0..846b4180625ab 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A personnal accounting application"; + description = "Personnal accounting application"; mainProgram = "grisbi"; longDescription = '' Grisbi is an application written by French developers, so it perfectly diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 99aaa7fa3bfe6..000942ff68bdd 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { hash = "sha256-YMNf6v40GuyP7Z3ksKh13A9cFnTF9YBP9xkKbGxT3AE="; }; + patches = [ + ./fix-clang-build.diff + ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; diff --git a/pkgs/applications/office/homebank/fix-clang-build.diff b/pkgs/applications/office/homebank/fix-clang-build.diff new file mode 100644 index 0000000000000..1b8c7fd359e23 --- /dev/null +++ b/pkgs/applications/office/homebank/fix-clang-build.diff @@ -0,0 +1,23 @@ +C Standard says in 6.8.1: + + labeled-statement: + identifier : statement + case constant-expression : statement + default : statement + +Notably, only expressions and no declarations are allowed. A common workaround for this +is adding an empty statement. + +diff --git a/src/rep-budget.c b/src/rep-budget.c +index eb5cce6..61e2e77 100644 +--- a/src/rep-budget.c ++++ b/src/rep-budget.c +@@ -255,7 +255,7 @@ gint tmpmode; + } + else + { +-libname: ++libname: ; + gchar *name; + + gtk_tree_model_get(model, iter, diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 37240b8ac5691..132194d0c7824 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; + description = "Open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; longDescription = '' Kexi is a visual database applications creator. It can be used for creating database schemas, diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index e1b3a2b1a7292..28064da7fe4cb 100644 --- a/pkgs/applications/office/kitsas/default.nix +++ b/pkgs/applications/office/kitsas/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/artoh/kitupiikki"; - description = "An accounting tool suitable for Finnish associations and small business"; + description = "Accounting tool suitable for Finnish associations and small business"; mainProgram = "kitsas"; maintainers = with maintainers; [ gspia ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index e19d4492ac918..00e3636fc3971 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -14,7 +14,7 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "ledger-web"; meta = with lib; { - description = "A web frontend to the Ledger CLI tool"; + description = "Web frontend to the Ledger CLI tool"; homepage = "https://github.com/peterkeen/ledger-web"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg manveru nicknovitski ]; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index a8060a183d9cd..c81d08d31d98f 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -63,11 +63,8 @@ stdenvNoCC.mkDerivation { #!nix-shell -i bash --argstr aarch64Url ${aarch64Url} --argstr x86_64Url ${x86_64Url} --argstr version ${version} ${updateNix} set -eou pipefail - # reset version first so that both platforms are always updated and in sync - update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${defaultNixFile} --system=aarch64-darwin - update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin - update-source-version libreoffice-bin 0 ${lib.fakeSha256} --file=${defaultNixFile} --system=x86_64-darwin - update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin + update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin --ignore-same-version + update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin --ignore-same-version ''; meta = with lib; { diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7007b59b30129..d679b168e24ff 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -47,7 +47,7 @@ , libGLU , libGL , bsh -, CoinMP +, coinmp , libwps , libabw , libargon2 @@ -97,7 +97,7 @@ , libetonyek , liborcus , libpng -, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false , qtbase ? null @@ -288,7 +288,7 @@ in stdenv.mkDerivation (finalAttrs: { # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html (libpng.override { apngSupport = false; }) perlPackages.ArchiveZip - CoinMP + coinmp perlPackages.IOCompress abseil-cpp ant diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index aa31b5f55f2e1..a639c97b96773 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.115.0"; + version = "2.117.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-ir96BQQ+dlUv2aNU9iQ+jnpeLE3D3ow9RPGstREUWNA="; + hash = "sha256-1Gwgb0oUtIjZX0f/HJmA5ihwurq9RlpMMLrTaDav0SM="; }; appimageContents = appimageTools.extractType2 { @@ -34,7 +34,7 @@ in appimageTools.wrapType2 { meta = with lib; { homepage = "https://www.mendeley.com"; - description = "A reference manager and academic social network"; + description = "Reference manager and academic social network"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 4bd45374ece26..433b8855a9a21 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.3"; + version = "3.4.5"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-QxbvD18yoIidiDoU7FsCpdgYZolp8LRx93d1GTjtnfA="; + hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { mainProgram = "morgen"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ justanotherariel wolfangaukang ]; + maintainers = with maintainers; [ justanotherariel ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/office/notes/default.nix b/pkgs/applications/office/notes/default.nix index dda8ddb5beacf..7f41ca33e3dcf 100644 --- a/pkgs/applications/office/notes/default.nix +++ b/pkgs/applications/office/notes/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "A fast and beautiful note-taking app"; + description = "Fast and beautiful note-taking app"; mainProgram = "notes"; downloadPage = "https://github.com/nuttyartist/notes"; homepage = "https://www.get-notes.com"; diff --git a/pkgs/applications/office/notion-app-enhanced/default.nix b/pkgs/applications/office/notion-app-enhanced/default.nix index 61dd21920ae1d..59c36ab17a876 100644 --- a/pkgs/applications/office/notion-app-enhanced/default.nix +++ b/pkgs/applications/office/notion-app-enhanced/default.nix @@ -20,7 +20,7 @@ in appimageTools.wrapType2 { ''; meta = with lib; { - description = "Notion Desktop builds with Notion Enhancer for Windows, MacOS and Linux."; + description = "Notion Desktop builds with Notion Enhancer for Windows, MacOS and Linux"; homepage = "https://github.com/notion-enhancer/desktop"; license = licenses.unfree; maintainers = with maintainers; [ sei40kr ]; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 7dc7444379cc7..c49d9bc2c4259 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gspell webkitgtk libgringotts ]; meta = with lib; { - description = "A handy personal organizer"; + description = "Handy personal organizer"; mainProgram = "osmo"; homepage = "https://clayo.org/osmo/"; license = licenses.gpl2; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 554e86664f1b3..6aa2af7dba4c3 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -7,7 +7,7 @@ , python3 , giflib , darwin -, ghostscript +, ghostscript_headless , imagemagickBig , jbig2enc , optipng @@ -24,13 +24,13 @@ }: let - version = "2.8.6"; + version = "2.10.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-Jcy/nds/JuivRV8mRtq2FbBB2L/CGqmoHoG1wVCwHFU="; + hash = "sha256-LwWdgoVlZjL5o+T8zzU9jkYaQbdiZokrCGn8ZTIQ4OQ="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -50,12 +50,24 @@ let hash = "sha256-ng98DTw49zyFjrPnEwfnPfONyjKKZYuLl0qduxSppYk="; }; }); + + djangorestframework = prev.djangorestframework.overridePythonAttrs (oldAttrs: rec { + version = "3.14.0"; + src = oldAttrs.src.override { + rev = version; + hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; + }; + nativeCheckInputs = with prev; [ + pytest7CheckHook + pytest-django + ]; + }); }; }; path = lib.makeBinPath [ - ghostscript + ghostscript_headless imagemagickBig jbig2enc optipng @@ -74,7 +86,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-xRUZnFekzWHPtlUbpt0JZmlNjdjS1bBZDz8MmH8DC2U="; + npmDepsHash = "sha256-zmlYwlH2cnGbbKf6jt5zBLh0Iv3C9/xN0iA4xVetRNE="; nativeBuildInputs = [ pkg-config @@ -138,6 +150,7 @@ python.pkgs.buildPythonApplication rec { django-filter django-guardian django-multiselectfield + django-soft-delete djangorestframework djangorestframework-guardian2 drf-writable-nested @@ -153,7 +166,7 @@ python.pkgs.buildPythonApplication rec { ocrmypdf pathvalidate pdf2image - psycopg2 + psycopg python-dateutil python-dotenv python-gnupg @@ -248,6 +261,8 @@ python.pkgs.buildPythonApplication rec { # AssertionError: 10 != 4 (timezone/time issue) # Due to getting local time from modification date in test_consumer.py "testNormalOperation" + # Something broken with new Tesseract and inline RTL/LTR overrides? + "test_rtl_language_detection" ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index b5620d3f40df0..4460e50ab6246 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,7 +1,6 @@ { buildPythonPackage , lib , fetchFromGitLab -, fetchpatch , pyenchant , scikit-learn , pypillowfight @@ -34,13 +33,6 @@ buildPythonPackage rec { sourceRoot = "${src.name}/paperwork-backend"; patches = [ - # fixes building with recent scipy - # remove on next release - (fetchpatch { - url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/abcebfe9714644d4e259e53b10e0e9417b5b864f.patch"; - hash = "sha256-YjVpphThW5Livs+PZJZDSgJvhLSXhZ1bnlWMwfY4HTg="; - }) - # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 ./flaky_test.patch ]; diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 9e6beb5053a40..2393ac0ece553 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -143,7 +143,7 @@ python3Packages.buildPythonApplication rec { ''; meta = { - description = "A personal document manager for scanned documents"; + description = "Personal document manager for scanned documents"; homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 2f61689611d60..2f54b435928f6 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "sha256-fVw+W10yEPLf6IUyaDpnmu7tPOqbvNLE8IK8mjHvurQ="; + sha256 = "sha256-xQN1IUbTQEHtyW5F8Zbg2EUN5K87oYqnSdzo0gEeOfI="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix index 2aeca54c1e966..73a5b54cb4424 100644 --- a/pkgs/applications/office/pdfmixtool/default.nix +++ b/pkgs/applications/office/pdfmixtool/default.nix @@ -50,7 +50,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "An application to split, merge, rotate and mix PDF files"; + description = "Application to split, merge, rotate and mix PDF files"; mainProgram = "pdfmixtool"; homepage = "https://gitlab.com/scarpetta/pdfmixtool"; license = licenses.gpl3Only; diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index ca91b33ecae6e..d0b682e9b9663 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/Archive/pinpoint"; - description = "A tool for making hackers do excellent presentations"; + description = "Tool for making hackers do excellent presentations"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 6188ffa767416..3a084c358469a 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -7,7 +7,7 @@ , pkg-config , vala , wrapGAppsHook4 -, evolution-data-server +, evolution-data-server-gtk4 , glib , glib-networking , gst_all_1 @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.7.4"; + version = "4.8.4"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-x76HasjETqXqE5yXE69/69NAYEWAksHSt0nYRq8/P0k="; + hash = "sha256-iQo7ETz5j/Uy5a96XFRkZ0U67dTHWEYLsr/qUi79Y4E="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - evolution-data-server + evolution-data-server-gtk4 glib glib-networking # Needed for GtkMediaStream creation with success.ogg, see #311295. diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index c320729ee9ee6..72cf6cbb57523 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.68.4"; + version = "0.69.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-E4uVI2MJ2tD2wuAxxzCZSmNRbKTTzhi44c4ip7uEhCk="; + hash = "sha256-5U1MGZ/CWI0m1utXCak6qWEHIFwMvZSqRt4qrUPCqVo="; }; nativeBuildInputs = [ @@ -69,11 +69,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A simple tool to calculate the overall performance of an investment portfolio"; + description = "Simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; - maintainers = with maintainers; [ elohmeier kilianar oyren shawn8901 ]; + maintainers = with maintainers; [ kilianar oyren shawn8901 ]; mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index eb28bf2dfd920..8ada870912eb9 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -8,6 +8,7 @@ , libcanberra-gtk3 , poppler_gi , withGstreamer ? stdenv.isLinux +, gst_all_1 , withVLC ? stdenv.isLinux }: @@ -29,7 +30,16 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 poppler_gi - ] ++ lib.optional withGstreamer libcanberra-gtk3; + ] ++ lib.optionals withGstreamer [ + libcanberra-gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + (gst_all_1.gst-plugins-good.override {gtkSupport = true;}) + gst_all_1.gst-libav + gst_all_1.gst-vaapi + ]; propagatedBuildInputs = with python3Packages; [ pycairo diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 3003475b22771..53563d72d6584 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.5.8"; + version = "24.6.3"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-ciTgJxDRQdPiQuXsiesYgvwSIdtJnkzYwQhvoKYS6mo="; + hash = "sha256-UdWyS5DalnGDoNEOx8d9MglKpJeqOXY1mTgLl3r/9gY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix index 9b0bb09df9044..56bd5f126afae 100644 --- a/pkgs/applications/office/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { }; meta = with lib; { - description = "A tabbed document viewer"; + description = "Tabbed document viewer"; mainProgram = "qpdfview"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/office/rime-cli/default.nix b/pkgs/applications/office/rime-cli/default.nix index a5b989528459d..9c89db2125958 100644 --- a/pkgs/applications/office/rime-cli/default.nix +++ b/pkgs/applications/office/rime-cli/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/puddinging/rime-cli"; changelog = "https://github.com/puddinging/rime-cli/releases/tag/v${version}"; - description = "A command line tool to add customized vocabulary for Rime IME"; + description = "Command line tool to add customized vocabulary for Rime IME"; license = licenses.asl20; maintainers = with maintainers; [ urandom ]; mainProgram = "rime-cli"; diff --git a/pkgs/applications/office/roam-research/common.nix b/pkgs/applications/office/roam-research/common.nix index 8e63b111ad2af..19e51e7b0eae3 100644 --- a/pkgs/applications/office/roam-research/common.nix +++ b/pkgs/applications/office/roam-research/common.nix @@ -1,22 +1,22 @@ { fetchurl }: let pname = "roam-research"; - version = "0.0.18"; + version = "0.0.19"; in { inherit pname version; sources = { x86_64-darwin = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; - hash = "sha256-jyFNH3qrgrsftExL/b2t8bY3W3fYVz+Gp11AuaIMxbg="; + hash = "sha256-pIH4p7dnmyOgGyruSJ39xB8iJ45wtxcIQmfUeBLlDes="; }; aarch64-darwin = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; - hash = "sha256-AnyvFCbyUi6tcgxYQAj+zPLl4/kVh9ZeupetRhzH0PU="; + hash = "sha256-iQRaaSU033t3WVWZSKuXCPJbMoNpwLnDHBz5QURu6Gw="; }; x86_64-linux = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; - hash = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; + hash = "sha256-eDN+hrAc+ePRELcXAs5WypzPlJ+Wtg3kUarf8rq5CnA="; }; }; } diff --git a/pkgs/applications/office/roam-research/darwin.nix b/pkgs/applications/office/roam-research/darwin.nix index 1369a2352b585..372186f551f1b 100644 --- a/pkgs/applications/office/roam-research/darwin.nix +++ b/pkgs/applications/office/roam-research/darwin.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A note-taking tool for networked thought"; + description = "Note-taking tool for networked thought"; homepage = "https://roamresearch.com/"; maintainers = with lib.maintainers; [ dbalan ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/office/roam-research/linux.nix b/pkgs/applications/office/roam-research/linux.nix index 8733ce33026a8..04a05d95ffc2f 100644 --- a/pkgs/applications/office/roam-research/linux.nix +++ b/pkgs/applications/office/roam-research/linux.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; meta = with lib; { - description = "A note-taking tool for networked thought"; + description = "Note-taking tool for networked thought"; homepage = "https://roamresearch.com/"; maintainers = with lib.maintainers; [ dbalan ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 5f2a117198965..85c0afe9db66a 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-4J3Xjm22HQG5MhEI/t7bzNbsCrNS3Vuv24sEHw73npk="; + hash = "sha256-fv+bH0fjcuVrs2nx2+GP5JEBeJtea8/beJDgNGtkE4M="; }; nativeBuildInputs = [ @@ -70,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { maintainers = with maintainers; [ - kiwi arthsmn ]; description = "Desktop Publishing (DTP) and Layout program"; diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix index f7533adb62c58..f4cc1670383bc 100644 --- a/pkgs/applications/office/semantik/default.nix +++ b/pkgs/applications/office/semantik/default.nix @@ -84,7 +84,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A mind-mapping application for KDE"; + description = "Mind-mapping application for KDE"; license = licenses.mit; homepage = "https://waf.io/semantik.html"; maintainers = [ maintainers.shamilton ]; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index b3c1c39379552..851f53039dd4d 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A personal finances manager, powered by KDE"; + description = "Personal finances manager, powered by KDE"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ joko ]; homepage = "https://skrooge.org/"; diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 6162aa2326062..fed47d637f266 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -120,7 +120,7 @@ in stdenv.mkDerivation { desktopItems = builtins.attrValues desktopItems; meta = with lib; { - description = "An office suite with a word processor, spreadsheet and presentation program"; + description = "Office suite with a word processor, spreadsheet and presentation program"; homepage = "https://www.softmaker.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 9b32967159275..1e404ddc24c12 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "8.0.5"; + version = "8.0.10"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-nH7dCrXBhkAYbvb9CPc4zhslFiYtA1ChuYPoHMdBBwQ="; + sha256 = "sha256-YJx5ygHx0ZYPmw3xFGjPRx8nR20D+XR9SMxE2ymuWes="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 6ec176393e3e6..cc2522ffa7282 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A free, open-source Japanese dictionary and kanji lookup tool"; + description = "Free, open-source Japanese dictionary and kanji lookup tool"; mainProgram = "tagainijisho"; homepage = "https://www.tagaini.net/"; license = with licenses; [ diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index a7b88321a82d6..2510d42b9a82a 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "2.0.10"; + version = "2.0.20"; src = fetchurl { url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-wign7U1p4HX6/RwnMm2iVSNaYRhn8Ia6QQd5X6m3B0E="; + hash = "sha256-5w50QMSMmkpuhSOqv3LjrcQQDwaD7pIdKUo+8YUgvpk="; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A powerful to-do & task management app with seamless cloud synchronization across all your devices"; + description = "Powerful to-do & task management app with seamless cloud synchronization across all your devices"; homepage = "https://ticktick.com/home/"; license = licenses.unfree; maintainers = with maintainers; [ hbjydev ]; diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 7ece5e9b4b030..4ec8101db0e58 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A simple command line time tracker written in ruby"; + description = "Simple command line time tracker written in ruby"; homepage = "https://github.com/samg/timetrap"; license = licenses.mit; maintainers = with maintainers; [ jerith666 manveru nicknovitski ]; diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 247b9f7caea47..d3aa67a47a045 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -4,12 +4,12 @@ }: let - version = "6.7.8"; + version = "6.8.1"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-nMvbr2PQBWyrhY3mv/4wsdWPhNx5hLFaAp0Ey3nvp7g="; + hash = "sha256-9t21aIEhLNIY7kSJkcvUVZ8R9/CuW0ZEu8kWkvMMQrM="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 1af2bbe23c358..c2a84adc2a0da 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-05-20"; + version = "0-unstable-2024-06-20"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "149d3377692cf5c585522f9245d9eb5dd7ddb742"; - hash = "sha256-qqeK13EazfdQteYcBMgWQ/0F4sBaOYCUpw7BMwfoe7k="; + rev = "d363b4207281caaa6f3b84af93b0cd56c1855692"; + hash = "sha256-aZIt0DAGDQmIeLZHXjYao5CUhjLp9pjTiXJyoDi0kpQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index ee8f067b339f4..27d50caedde05 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -21,13 +21,13 @@ with lib; python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.2.1"; + version = "7.2.2"; disabled = !python3Packages.isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-CK3XkHX16Ec/j1DhC29uoj/YqcLXs/KsIb7v/cfoiaM="; + sha256 = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = { - description = "The client of the Tryton application platform"; + description = "Client of the Tryton application platform"; mainProgram = "tryton"; longDescription = '' The client for Tryton, a three-tier high-level general purpose diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 4394a58bdb3e9..1b815228ac2d5 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://vnotex.github.io/vnote"; - description = "A pleasant note-taking platform"; + description = "Pleasant note-taking platform"; mainProgram = "vnote"; changelog = "https://github.com/vnotex/vnote/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.lgpl3Plus; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 0c04b0ddd52ec..8cf348020c437 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://tailordev.github.io/Watson/"; - description = "A wonderful CLI to track your time!"; + description = "Wonderful CLI to track your time!"; mainProgram = "watson"; license = licenses.mit; maintainers = with maintainers; [ mguentner nathyong oxzi ]; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 8f6b0d650b28a..a9bb14d1b4e2a 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -19,6 +19,7 @@ , curl , coreutils , cacert +, libjpeg , useChineseVersion ? false }: let @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { alsa-lib at-spi2-core libtool + libjpeg libxkbcommon nspr mesa @@ -120,6 +122,9 @@ stdenv.mkDerivation rec { preFixup = '' # The following libraries need libtiff.so.5, but nixpkgs provides libtiff.so.6 patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so,addons/pdfbatchcompression/libpdfbatchcompressionapp.so} + patchelf --add-needed libtiff.so $out/opt/kingsoft/wps-office/office6/libwpsmain.so + # Fix: Wrong JPEG library version: library is 62, caller expects 80 + patchelf --add-needed libjpeg.so $out/opt/kingsoft/wps-office/office6/libwpsmain.so # dlopen dependency patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so ''; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 9680748287b9b..98d83f53f2d33 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "A desktop wiki"; + description = "Desktop wiki"; homepage = "https://zim-wiki.org/"; changelog = "https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/${version}/CHANGELOG.md"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index 96429770662a1..a274ca210dafa 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -17,14 +17,14 @@ buildGoModule rec { CGO_ENABLED = 1; - ldflags = [ "-s" "-w" "-X=main.Build=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Build=${version}" "-X=main.Version=${version}"]; tags = [ "fts5" ]; meta = with lib; { maintainers = with maintainers; [ pinpox ]; license = licenses.gpl3; - description = "A zettelkasten plain text note-taking assistant"; + description = "Zettelkasten plain text note-taking assistant"; homepage = "https://github.com/mickael-menu/zk"; mainProgram = "zk"; }; diff --git a/pkgs/applications/office/zotero/zotero_7.nix b/pkgs/applications/office/zotero/zotero_7.nix deleted file mode 100644 index ae8cc9e9fa6f6..0000000000000 --- a/pkgs/applications/office/zotero/zotero_7.nix +++ /dev/null @@ -1,153 +0,0 @@ -{ lib -, stdenv -, fetchurl -, wrapGAppsHook3 -, autoPatchelfHook -, makeDesktopItem -, atk -, cairo -, coreutils -, curl -, cups -, dbus-glib -, dbus -, dconf -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, gtk3 -, libX11 -, libXScrnSaver -, libxcb -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXinerama -, libXrender -, libXt -, libnotify -, gnome -, libGLU -, libGL -, nspr -, nss -, pango -, gsettings-desktop-schemas -, alsa-lib -, libXtst -}: - -stdenv.mkDerivation rec { - pname = "zotero"; - version = "7.0.0-beta"; - - src = fetchurl { - url = "https://download.zotero.org/client/beta/${version}.65%2Bb047f3d90/Zotero-${version}.65%2Bb047f3d90_linux-x86_64.tar.bz2"; - hash = "sha256-e7T/hvb8bFb4hkouihBkgqUu4ugYoUMHNVKxh0r/WUM="; - }; - - nativeBuildInputs = [ - wrapGAppsHook3 - autoPatchelfHook - ]; - buildInputs = [ - gsettings-desktop-schemas - glib - gtk3 - gnome.adwaita-icon-theme - dconf - libXtst - alsa-lib - stdenv.cc.cc - atk - cairo - curl - cups - dbus-glib - dbus - fontconfig - freetype - gdk-pixbuf - glib - glibc - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXt - libnotify - libGLU - libGL - nspr - nss - pango - ]; - - dontConfigure = true; - dontBuild = true; - dontStrip = true; - - - desktopItem = makeDesktopItem { - name = "zotero"; - exec = "zotero -url %U"; - icon = "zotero"; - comment = meta.description; - desktopName = "Zotero"; - genericName = "Reference Management"; - categories = [ "Office" "Database" ]; - startupNotify = true; - mimeTypes = [ "x-scheme-handler/zotero" "text/plain" ]; - }; - - - installPhase = '' - runHook preInstall - - mkdir -p "$prefix/usr/lib/zotero-bin-${version}" - cp -r * "$prefix/usr/lib/zotero-bin-${version}" - mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" - - # install desktop file and icons. - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications/ - for size in 32 64 128; do - install -Dm444 icons/icon$size.png \ - $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png - done - install -Dm444 icons/symbolic.svg \ - $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ coreutils ]} - ) - ''; - - meta = with lib; { - homepage = "https://www.zotero.org"; - description = "Collect, organize, cite, and share your research sources"; - mainProgram = "zotero"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.agpl3Only; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ atila ]; - }; -} |