diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/office')
17 files changed, 47 insertions, 35 deletions
diff --git a/nixpkgs/pkgs/applications/office/abiword/default.nix b/nixpkgs/pkgs/applications/office/abiword/default.nix index b90b23a3905a..8f62a4187611 100644 --- a/nixpkgs/pkgs/applications/office/abiword/default.nix +++ b/nixpkgs/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , gtk3 , fribidi @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ="; }; + patches = [ + # Fix build with libxml2 2.12 + (fetchpatch { + url = "https://gitlab.gnome.org/World/AbiWord/-/commit/2a06be6a10a0718f8a3d8e00c317f5042c99a467.patch"; + hash = "sha256-vfh81tGXe9dgnjcAtoWHOK8CtW7MZ75FFjnfKTkiKkk="; + }) + ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook diff --git a/nixpkgs/pkgs/applications/office/appflowy/default.nix b/nixpkgs/pkgs/applications/office/appflowy/default.nix index a8d0f7566c8e..72b70ab73acd 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.4.1"; + version = "0.4.3"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-9wv7/3wtR1xiOHRYXP29Qbom1Xl9xZbhCFEPf0LJitg="; + hash = "sha256-JrcqVPlFr8zD9ZSBxk9WqN7KCLKq+yCjMfA4QbIfDZE="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 6be1d11ae3b6..e7fa0c53f730 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -13,6 +13,7 @@ , IOCompress , zlib , libjpeg +, liblangtag , expat , freetype , libwpd @@ -225,6 +226,17 @@ in stdenv.mkDerivation (finalAttrs: { url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=ececb678b8362e3be8e02768ddd5e4197d87dc2a"; hash = "sha256-TUfKlwNxUTOJ95VLqwVD+ez1xhu7bW6xZlgIaCyIiNg="; }) + + # Backport libxml 2.12 build fixes + # FIXME: remove in next release + (fetchpatch { + url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb"; + hash = "sha256-uEgRx1eyS3Wx2ZDWEsUmpIbuKezVrIbO++qSL2QI8Lk="; + }) + (fetchpatch { + url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=cbb17a548b5cc6a99b6ed7735479bb4f2bc40f26"; + hash = "sha256-ofhif37uvQI+gidaUpyr6XlyBc3gTJUDBRb3ootrzz0="; + }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) @@ -436,6 +448,7 @@ in stdenv.mkDerivation (finalAttrs: { "--with-system-headers" "--with-system-openssl" "--with-system-libabw" + "--with-system-liblangtag" "--without-system-libcmis" "--with-system-libwps" "--with-system-openldap" @@ -466,7 +479,6 @@ in stdenv.mkDerivation (finalAttrs: { "--without-system-lpsolve" "--without-system-libetonyek" "--without-system-libfreehand" - "--without-system-liblangtag" "--without-system-libmspub" "--without-system-libnumbertext" "--without-system-libpagemaker" @@ -566,6 +578,7 @@ in stdenv.mkDerivation (finalAttrs: { libepoxy libexttextcat libjpeg + liblangtag libmspack libmwaw libmysqlclient diff --git a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index 0e40c19fef41..ce4383c3cc96 100644 --- a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -21,13 +21,13 @@ }: let - version = "2.2.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-ds/hQ0+poUTO2bnXiHvNUanVFJcxxyuW3a9Yxcq5cAg="; + hash = "sha256-2XnOap37ZQjT0qx2ygxXo7n1HJcIEoc5TrMI1JIk4G8="; }; python = python3; @@ -52,7 +52,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-o/inxHiOeMhQvZVcy6CM3Jy8B2sSp+8WJBknp3KVbZM="; + npmDepsHash = "sha256-BFfbRrpF8p0AfEdl/KDWWG7qN+F9edvTW3j9jgvLIrc="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix b/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix index d434e000da5e..ed9a7d6ed5ad 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { patchShebangs ../tools ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ distro setuptools diff --git a/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index cd0290f08746..95d5effa151f 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { patchShebangs ../tools ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ pkgs.gettext pkgs.which diff --git a/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix b/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix index 95608b26e2fe..4460e50ab624 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -44,8 +44,6 @@ buildPythonPackage rec { patchShebangs ../tools ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ distro gtk3 diff --git a/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index 9950075d6b27..e21379678a17 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -42,8 +42,6 @@ python3Packages.buildPythonApplication rec { sourceRoot = "${src.name}/paperwork-gtk"; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' chmod a+w -R .. patchShebangs ../tools diff --git a/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix b/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix index 7a1d82a5eb31..cbda78976b5b 100644 --- a/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -32,8 +32,6 @@ buildPythonPackage rec { chmod a+w -R .. patchShebangs ../tools ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ openpaperwork-core paperwork-backend diff --git a/nixpkgs/pkgs/applications/office/planify/default.nix b/nixpkgs/pkgs/applications/office/planify/default.nix index 401dc150b27d..9c8aad5e9cae 100644 --- a/nixpkgs/pkgs/applications/office/planify/default.nix +++ b/nixpkgs/pkgs/applications/office/planify/default.nix @@ -11,6 +11,7 @@ , glib , glib-networking , gtk4 +, gtksourceview5 , json-glib , libadwaita , libgee @@ -24,13 +25,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.3.2"; + version = "4.4"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-i+Up92Gl3FjgQ4GpcZruvYD//TPNWktSuWXGgDTwbWw="; + hash = "sha256-HX6ZMx2NUAQxEGLIk/wgUlQX0BFtee3+t/JdlMTIYBw="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { glib glib-networking gtk4 + gtksourceview5 json-glib libadwaita libgee diff --git a/nixpkgs/pkgs/applications/office/portfolio/default.nix b/nixpkgs/pkgs/applications/office/portfolio/default.nix index c426d342369e..457982fae2e8 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.67.0"; + version = "0.67.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-bm38t8wgLEYZVDsMnOv3Wj6TgKu2s36wo8q0Sj7pPNI="; + hash = "sha256-Bx1Q7eXJuu/Vh6UuZYlkUlvw6FXTObYAynHV+60cNVY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 5c3dc0f2c296..162d4e2683db 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 = "24.1.1"; + version = "24.1.2"; 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-yCsYIi1StZOYutDAWS04u3DccrPB+2oqaynnH4GBEPc="; + hash = "sha256-UlHLGO5Rictj0/eZKxyFKxa/2XasQOAixnejOc+dH0M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/scribus/default.nix b/nixpkgs/pkgs/applications/office/scribus/default.nix index 54b97b3e9f04..00f7d2b51f8b 100644 --- a/nixpkgs/pkgs/applications/office/scribus/default.nix +++ b/nixpkgs/pkgs/applications/office/scribus/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-lLl0kOzhcoaNxPBMeqLulQtBtfL/QoXfN9YV8ETQOOU="; + hash = "sha256-4J3Xjm22HQG5MhEI/t7bzNbsCrNS3Vuv24sEHw73npk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/skrooge/default.nix b/nixpkgs/pkgs/applications/office/skrooge/default.nix index e59d473a0789..b3c1c3937955 100644 --- a/nixpkgs/pkgs/applications/office/skrooge/default.nix +++ b/nixpkgs/pkgs/applications/office/skrooge/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, - cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee, + cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee, qtxmlpatterns, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.28.0"; + version = "2.31.0"; src = fetchurl { url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz"; - sha256 = "sha256-s2SkGMBx7HVpr1NBUJpqji3PTPnw4RqnkakdQVC5ric="; + hash = "sha256-S90sUKJkUwgPAGlIuyN05a5DoehTFpFOnVLMF8Ac+HI="; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ mkDerivation rec { ]; buildInputs = [ - qtwebengine qtscript grantlee kxmlgui kwallet kparts + qtwebengine qtscript grantlee kxmlgui kwallet kparts qtxmlpatterns kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx ]; diff --git a/nixpkgs/pkgs/applications/office/todoman/default.nix b/nixpkgs/pkgs/applications/office/todoman/default.nix index f2940b1e3fb9..d53306e77904 100644 --- a/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -19,8 +19,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ installShellFiles ] ++ (with python3.pkgs; [ diff --git a/nixpkgs/pkgs/applications/office/trilium/desktop.nix b/nixpkgs/pkgs/applications/office/trilium/desktop.nix index 0f701abbbf2c..32c7c2a7024c 100644 --- a/nixpkgs/pkgs/applications/office/trilium/desktop.nix +++ b/nixpkgs/pkgs/applications/office/trilium/desktop.nix @@ -7,13 +7,13 @@ let pname = "trilium-desktop"; - version = "0.62.3"; + version = "0.62.5"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "1fw6mbcnqrgk627npsxp7xbyab7108msihlkf5i998rji8vaz64m"; + linuxSource.sha256 = "1f2f8nvj1gx9i797mck5aazgz821sjcs06538py9za4m532i66pj"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "0wp58qjs5a91g80h115xnkkrih741bs3vjdr6wilwcp1blbgnxjj"; + darwinSource.sha256 = "19zny4akf3hxqjqayiz4s47vdblbrn4kgwg3nykljv4lpqnqkyn3"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/nixpkgs/pkgs/applications/office/trilium/server.nix b/nixpkgs/pkgs/applications/office/trilium/server.nix index 270f9751ff80..4beaba6688c9 100644 --- a/nixpkgs/pkgs/applications/office/trilium/server.nix +++ b/nixpkgs/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "00vb36a6kxdmn8m0nmzpdi2h7qmg63xrwwbq4hvjp2njjf32wki1"; - version = "0.62.3"; + serverSource.sha256 = "1s0pfb3virhxsh5kkgq4yfhdnv1lq2z0zdcikilnayzp0lpjskhb"; + version = "0.62.5"; in stdenv.mkDerivation { pname = "trilium-server"; inherit version; |