diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/office')
13 files changed, 71 insertions, 36 deletions
diff --git a/nixpkgs/pkgs/applications/office/appflowy/default.nix b/nixpkgs/pkgs/applications/office/appflowy/default.nix index a0e95b62edfe..dfa19511327d 100644 --- a/nixpkgs/pkgs/applications/office/appflowy/default.nix +++ b/nixpkgs/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.6"; + version = "0.3.7"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-MH5NLppwe/W5d0duNwyQtUBryqDzfV3u0LqWI40GqLQ="; + hash = "sha256-Z2iNYNpf0a3kXBLaJeGVYIW5EGiBuMPdFNK2jSpnmws="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/office/autokey/default.nix b/nixpkgs/pkgs/applications/office/autokey/default.nix index c490be238112..af8ceeb4b7be 100644 --- a/nixpkgs/pkgs/applications/office/autokey/default.nix +++ b/nixpkgs/pkgs/applications/office/autokey/default.nix @@ -6,17 +6,19 @@ , gtksourceview3 , libappindicator-gtk3 , libnotify +, gnome +, wmctrl }: python3Packages.buildPythonApplication rec { pname = "autokey"; - version = "0.95.10"; + version = "0.96.0"; src = fetchFromGitHub { owner = "autokey"; repo = "autokey"; rev = "v${version}"; - sha256 = "0f0cqfnb49wwdy7zl2f2ypcnd5pc8r8n7z7ssxkq20d4xfxlgamr"; + hash = "sha256-d1WJLqkdC7QgzuYdnxYhajD3DtCpgceWCAxGrk0KKew="; }; # Tests appear to be broken with import errors within the project structure @@ -35,8 +37,20 @@ python3Packages.buildPythonApplication rec { pyinotify xlib pygobject3 + packaging ]; + runtimeDeps = [ + gnome.zenity + wmctrl + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=(''${gappsWrapperArgs[@]} --prefix PATH : ${ lib.makeBinPath runtimeDeps }) + ''; + postInstall = '' # remove Qt version which we currently do not support rm $out/bin/autokey-qt $out/share/applications/autokey-qt.desktop diff --git a/nixpkgs/pkgs/applications/office/clockify/default.nix b/nixpkgs/pkgs/applications/office/clockify/default.nix index 37afa6cc226f..efd20632a2a3 100644 --- a/nixpkgs/pkgs/applications/office/clockify/default.nix +++ b/nixpkgs/pkgs/applications/office/clockify/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clockify"; - version = "2.0.3"; + version = "2.1.6"; src = fetchurl { - url = "https://web.archive.org/web/20211118160803/https://clockify-resources.s3.eu-central-1.amazonaws.com/downloads/Clockify_Setup.deb"; - sha256 = "sha256-eVZ3OqM1eoWfST7Qu9o8VmLm8ntD+ETf/0aes6RY4Y8="; + url = "https://web.archive.org/web/20231110130133/https://clockify.me/downloads/Clockify_Setup_x64.deb"; + hash = "sha256-jndoMk3vqk8a5jMzKVo6ThovSISmcu+hef9IJcg3reQ="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mv opt $out substituteInPlace $out/share/applications/clockify.desktop \ - --replace "/opt/Clockify" $out/bin + --replace "/opt/Clockify/" "" makeWrapper ${electron}/bin/electron $out/bin/clockify \ --add-flags $out/opt/Clockify/resources/app.asar @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://clockify.me"; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "clockify"; platforms = [ "x86_64-linux" ]; - }; } diff --git a/nixpkgs/pkgs/applications/office/fava/default.nix b/nixpkgs/pkgs/applications/office/fava/default.nix index b7e2105a94ea..2e869daff532 100644 --- a/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/nixpkgs/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.26.1"; + version = "1.26.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pj4kaQDXahjhN7bu7xxT/ZuoCfPdGyo898482S5gnlE="; + hash = "sha256-+rMuVfe6BDAcZgJkBb18YLFZirOBfad6WGbWtAT21uI="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; @@ -31,6 +31,11 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'setuptools_scm>=8.0' 'setuptools_scm' + ''; + preCheck = '' export HOME=$TEMPDIR ''; diff --git a/nixpkgs/pkgs/applications/office/gnucash/default.nix b/nixpkgs/pkgs/applications/office/gnucash/default.nix index eacda570cc0c..7c378bc52a90 100644 --- a/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchFromGitHub , fetchurl , fetchpatch , aqbanking @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { # Upstream uploaded a -1 tarball on the same release, remove on next release - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}-1.tar.bz2"; + url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}-1.tar.bz2"; hash = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w="; }; @@ -97,12 +98,29 @@ stdenv.mkDerivation rec { enableParallelChecking = true; checkTarget = "check"; + passthru.docs = stdenv.mkDerivation { + pname = "gnucash-docs"; + inherit version; + + src = fetchFromGitHub { + owner = "Gnucash"; + repo = "gnucash-docs"; + rev = version; + hash = "sha256-aPxQEcpo8SPv8lPQbxMl1wg8ijH9Rz0oo4K5lp3C/bw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libxml2 libxslt ]; + }; + preFixup = '' gappsWrapperArgs+=( + # documentation + --prefix XDG_DATA_DIRS : ${passthru.docs}/share # db drivers location --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd # gsettings schema location on Nix - --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} + --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${version}"} ) ''; diff --git a/nixpkgs/pkgs/applications/office/homebank/default.nix b/nixpkgs/pkgs/applications/office/homebank/default.nix index 88091fa4b035..105ec8456895 100644 --- a/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -1,16 +1,16 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook -, libsoup, gnome }: +, libsoup_3, gnome }: stdenv.mkDerivation rec { pname = "homebank"; - version = "5.6.6"; + version = "5.7.1"; src = fetchurl { url = "http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-ZW/N8YUU8r7SYY/+hqVYrqYW/KQqtuChfQJxXftl3A4="; + hash = "sha256-fwqSnXde7yalqfKfo8AT8+762/aYLMCGp8dd3bm09Ck="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; - buildInputs = [ gtk libofx libsoup gnome.adwaita-icon-theme]; + buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index 7c5a3dc93276..c5c291511ebb 100644 --- a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -215,7 +215,7 @@ python.pkgs.buildPythonApplication rec { whoosh zipp zope_interface - zxing_cpp + zxing-cpp ] ++ redis.optional-dependencies.hiredis ++ twisted.optional-dependencies.tls @@ -224,13 +224,13 @@ python.pkgs.buildPythonApplication rec { postBuild = '' # Compile manually because `pythonRecompileBytecodeHook` only works # for files in `python.sitePackages` - ${python.pythonForBuild.interpreter} -OO -m compileall src + ${python.pythonOnBuildForHost.interpreter} -OO -m compileall src # Collect static files - ${python.pythonForBuild.interpreter} src/manage.py collectstatic --clear --no-input + ${python.pythonOnBuildForHost.interpreter} src/manage.py collectstatic --clear --no-input # Compile string translations using gettext - ${python.pythonForBuild.interpreter} src/manage.py compilemessages + ${python.pythonOnBuildForHost.interpreter} src/manage.py compilemessages ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index a43546ee8e0d..9950075d6b27 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -13,7 +13,7 @@ , gettext , gobject-introspection , gdk-pixbuf -, texlive +, texliveSmall , imagemagick , perlPackages , writeScript @@ -21,9 +21,7 @@ let documentation_deps = [ - (texlive.combine { - inherit (texlive) scheme-small wrapfig gensymb; - }) + (texliveSmall.withPackages (ps: with ps; [ wrapfig gensymb ])) xvfb-run imagemagick perlPackages.Po4a diff --git a/nixpkgs/pkgs/applications/office/portfolio/default.nix b/nixpkgs/pkgs/applications/office/portfolio/default.nix index cf7b59f6fa1a..e507692d622e 100644 --- a/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.65.4"; + version = "0.65.6"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-2+1lwaO2+kq/EjJoA4EvGCMLH6iErR9KtWINLoO17+w="; + hash = "sha256-sI2DqhR9LmXxjkkMTDiMG/f/QXcBVPmEjbHFsmEP8qE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/qnotero/default.nix b/nixpkgs/pkgs/applications/office/qnotero/default.nix index e90184b52212..ff7ce4121298 100644 --- a/nixpkgs/pkgs/applications/office/qnotero/default.nix +++ b/nixpkgs/pkgs/applications/office/qnotero/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook }: python3Packages.buildPythonPackage rec { pname = "qnotero"; @@ -46,6 +46,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + broken = stdenv.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix index d81470be0476..1303afb9d66d 100644 --- a/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.10.1"; + version = "23.11.1"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-+BtzN+CdaxriA466m6aF0y7Jdvx1DGtSR+i6gGeAxSM="; + hash = "sha256-rsYB8aLVVpGGbiEDWCpGCPdZEsOajoGfoh6YYxilxpg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index 67fa25115fb0..8376b49b8197 100644 --- a/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "wpsoffice"; - version = "11.1.0.11704"; + version = "11.1.0.11708"; src = if useChineseVersion then fetchurl { url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb"; - hash = "sha256-ffLSon9FpQZDQ1uapchBUkVaHOXs+H/6kHJLNiWqwiE="; + hash = "sha256-GcWRrJ0I1Q6D2VK6YsPmd5Uir5LcIBFJa1amV2sUurk="; } else fetchurl { url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb"; - hash = "sha256-nxpMEWKiNjjEUoVJkhpvjnCuWBCCGjPk+sUlKz+KjMI="; + hash = "sha256-J40/wrmMz/r4eb2X/rbxWn04UcSsag7SO3aSqBLFSN4="; }; unpackCmd = "dpkg -x $src ."; diff --git a/nixpkgs/pkgs/applications/office/zotero/default.nix b/nixpkgs/pkgs/applications/office/zotero/default.nix index 506b934d77c9..32e42a8b944f 100644 --- a/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.27"; + version = "6.0.30"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-+nCPLVVBkEu0g2Kxt/XYAt6sYxYm05nPcmPNS2OejRs="; + hash = "sha256-4XQZ1xw9Qtk3SzHMsEUk+HuIYtHDAOMgpwzbAd5QQpU="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -153,6 +153,5 @@ stdenv.mkDerivation rec { license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ i077 ]; - knownVulnerabilities = [ "CVE-2023-5217" ]; }; } |