diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/office')
8 files changed, 89 insertions, 39 deletions
diff --git a/nixpkgs/pkgs/applications/office/gnucash/default.nix b/nixpkgs/pkgs/applications/office/gnucash/default.nix index a8630381ebf2..641d400886f9 100644 --- a/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" \ --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --prefix PERL5LIB ":" "$PERL5LIB" \ + --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" ''; diff --git a/nixpkgs/pkgs/applications/office/kmymoney/default.nix b/nixpkgs/pkgs/applications/office/kmymoney/default.nix index 6137a4dc1ad8..e15615f78a34 100644 --- a/nixpkgs/pkgs/applications/office/kmymoney/default.nix +++ b/nixpkgs/pkgs/applications/office/kmymoney/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "kmymoney"; - version = "5.0.8"; + version = "5.1.0"; src = fetchurl { url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "1h6l01a08f1xgk4dfpndl7rmgbp9npm58qi760jwl2gggprwwsxc"; + sha256 = "0l8kywq77yaf1bqgdqswrai9ws6a2l11drg0wgyi7f8js7qnif9d"; }; # Hidden dependency that wasn't included in CMakeLists.txt: diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 976fc0fcd2d7..66e12b221734 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext +{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, poppler, utillinux , librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf @@ -15,7 +15,8 @@ , gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ] , withHelp ? true -, kdeIntegration ? false +, kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null +, ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null , variant ? "fresh" } @ args: @@ -28,9 +29,10 @@ let inherit (primary-src) major minor subdir version; - lib = stdenv.lib; langsSpaces = lib.concatStringsSep " " langs; + mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; + srcs = { third_party = map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) @@ -47,7 +49,7 @@ let translations = primary-src.translations; help = primary-src.help; }; -in (stdenv.mkDerivation rec { +in (mkDrv rec { pname = "libreoffice"; inherit version; @@ -57,8 +59,9 @@ in (stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal" - + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; + NIX_CFLAGS_COMPILE = [ + "-I${librdf_rasqal}/include/rasqal" + ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ ./xdg-open-brief.patch @@ -84,8 +87,20 @@ in (stdenv.mkDerivation rec { tar -xf ${srcs.translations} ''; - postPatch = '' - sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx + ### QT/KDE + # + # We have to resort to the ugly patching of configure.ac as it assumes that + # the first directory that contains headers and libraries during the check + # contains all the relevant headers/libs which doesn't work with both as they + # are in multiple directories due to each having their own derivation. + postPatch = let + inc = e: path: + "${lib.getDev e}/include/KF5/${path}"; + libs = list: + lib.concatMapStringsSep " " (e: "-L${lib.getLib e}/lib") list; + in '' + substituteInPlace shell/source/unix/exec/shellexec.cxx \ + --replace /usr/bin/xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} # configure checks for header 'gpgme++/gpgmepp_version.h', # and if it is found (no matter where) uses a hardcoded path @@ -96,9 +111,24 @@ in (stdenv.mkDerivation rec { substituteInPlace configure.ac --replace \ 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' + '' + lib.optionalString kdeIntegration '' + substituteInPlace configure.ac \ + --replace '$QT5INC' ${qtbase.dev}/include \ + --replace '$QT5LIB' ${qtbase.out}/lib \ + --replace '-I$qt5_incdir ' '-I${qtx11extras.dev}/include '\ + --replace '-L$qt5_libdir ' '${libs [ qtbase qtx11extras ]} ' \ + --replace '$KF5INC' ${kcoreaddons.dev}/include \ + --replace '$KF5LIB' ${kcoreaddons.out}/lib \ + --replace '$kf5_incdir/KCore' ${inc kcoreaddons "KCore"} \ + --replace '$kf5_incdir/KI18n' ${inc ki18n "KI18n"} \ + --replace '$kf5_incdir/KConfig' ${inc kconfig "KConfig"} \ + --replace '$kf5_incdir/KWindow' ${inc kwindowsystem "KWindow"} \ + --replace '$kf5_incdir/KIO' ${inc kio "KIO"} \ + --replace '-L$kf5_libdir ' '${libs [ kconfig kcoreaddons ki18n kio kwindowsystem ]} ' ''; - QT4DIR = qt4; + dontUseCmakeConfigure = true; + dontUseCmakeBuildDir = true; preConfigure = '' configureFlagsArray=( @@ -264,14 +294,16 @@ in (stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" - substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" - substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice" + substituteInPlace "$f" \ + --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" \ + --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" done cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") + mkdir -p $dev cp -r include $dev ''; @@ -335,29 +367,35 @@ in (stdenv.mkDerivation rec { "--without-system-libstaroffice" "--without-system-libepubgen" "--without-system-libqxp" - "--without-system-mdds" + "--without-system-mdds" # we have mdds but our version is too new # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" "--without-system-qrcodegen" "--without-system-xmlsec" - ]; + ] ++ lib.optionals kdeIntegration [ + "--enable-kf5" + "--enable-qt5" + "--enable-gtk3-kde5" + ] ++ lib.optional (lib.versionOlder version "6.4") "--disable-gtk"; # disables GTK2, GTK3 is still there checkPhase = '' make unitcheck make slowcheck ''; - nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ]; + nativeBuildInputs = [ + gdb fontforge autoconf automake bison pkgconfig libtool + ] ++ lib.optional (!kdeIntegration) wrapGAppsHook; buildInputs = with xorg; [ ant ArchiveZip boost cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig - freetype getopt gperf gtk3 gtk2 + freetype getopt gperf gtk3 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base glib libmysqlclient + libXdmcp libpthreadstubs libGLU libGL mythes + glib libmysqlclient neon nspr nss openldap openssl pam perl pkgconfig poppler python3 sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf @@ -365,7 +403,8 @@ in (stdenv.mkDerivation rec { librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] - ++ lib.optional kdeIntegration kdelibs4; + ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) + ++ lib.optional kdeIntegration [ qtbase qtx11extras kcoreaddons kio ]; passthru = { inherit srcs jdk; diff --git a/nixpkgs/pkgs/applications/office/scribus/unstable.nix b/nixpkgs/pkgs/applications/office/scribus/unstable.nix index ebfaa231fbac..ff69329140bf 100644 --- a/nixpkgs/pkgs/applications/office/scribus/unstable.nix +++ b/nixpkgs/pkgs/applications/office/scribus/unstable.nix @@ -40,7 +40,7 @@ mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; - sha256 = "eQiyGmzoQyafWM7fX495GJMlfmIBzOX73ccNrKL+P3E="; + sha256 = "0w9zzsiaq3f7vpxybk01c9z2b4qqg67mzpyfb2gjchz8dhdb423r"; }; patches = [ @@ -66,7 +66,7 @@ mkDerivation rec { # Formating changes needed for the Poppler 0.86 patch to apply (fetchpatch { url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch"; - sha256 = "qwmVAZVYCijLNMVGwnOLJE8223vcRwPWfEvNKiDjw5o="; + sha256 = "16n3wch2mkabgkb06iywggdkckr4idrw4in56k5jh2jqjl0ra2db"; }) (fetchpatch { url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch"; diff --git a/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix b/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix index 77634efebe82..b04ef89769c6 100644 --- a/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "softmaker-office"; - version = "976"; - edition = "2018"; + version = "1014"; + edition = "2021"; suiteName = "SoftMaker Office"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; - sha256 = "0j6zm0cbxrcgm7glk84hvvbp4z0ys6v8bkwwhl5r7dbphyi72fw8"; + sha256 = "0wqaxng6s7lxwz6v2j6y1m5h4g4v63m0lscj7l2fpx5ksjlamp55"; }; archive = "office${edition}.tar.lzma"; diff --git a/nixpkgs/pkgs/applications/office/watson/default.nix b/nixpkgs/pkgs/applications/office/watson/default.nix index 52c94ce378e1..5d4b915edfb5 100644 --- a/nixpkgs/pkgs/applications/office/watson/default.nix +++ b/nixpkgs/pkgs/applications/office/watson/default.nix @@ -1,17 +1,27 @@ -{ stdenv, pythonPackages, fetchpatch, installShellFiles }: +{ stdenv, fetchFromGitHub, pythonPackages, fetchpatch, installShellFiles }: with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "1.8.0"; + version = "1.9.0"; - src = fetchPypi { - inherit version; - pname = "td-watson"; - sha256 = "1ip66jhbcqifdw1avbhngwym0vv7fsqxgbph11da5wlqwfwp060n"; + src = fetchFromGitHub { + owner = "TailorDev"; + repo = "Watson"; + rev = version; + sha256 = "0f0ldwadjf0xncx3m4w4wwqddd4wjwcsrbhby8vgsnqsn48dnfcx"; }; + patches = [ + # https://github.com/TailorDev/Watson/pull/380 + # The nixpkgs' arrow version is too new / not supported by Watson's latest release. + (fetchpatch { + url = "https://github.com/TailorDev/Watson/commit/69b9ad25551525d52060f7fb2eef3653e872a455.patch"; + sha256 = "0zrswgr0y219f92zi41m7cymfaspkhmlada4v9ijnsjjdb4bn2c9"; + }) + ]; + checkPhase = '' pytest -vs tests ''; @@ -21,8 +31,8 @@ buildPythonApplication rec { installShellCompletion --zsh --name _watson watson.zsh-completion ''; - checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; - propagatedBuildInputs = [ requests click arrow ]; + checkInputs = [ py pytest pytest-datafiles pytest-mock pytestrunner ]; + propagatedBuildInputs = [ arrow click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index 2d8f4d18621c..1d32e6ff027b 100644 --- a/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -36,7 +36,7 @@ , zlib }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "wpsoffice"; version = "11.1.0.9505"; diff --git a/nixpkgs/pkgs/applications/office/zotero/default.nix b/nixpkgs/pkgs/applications/office/zotero/default.nix index 55ab22cfc06e..bd4e5a6b9f7d 100644 --- a/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.85"; + version = "5.0.87"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "0zqc27kld7rm3akmrnf9ba1x2hb9838cbv6i3nkqvg81ly5gfbxs"; + sha256 = "01kq3w4il64gqz6s1vbv3iyzayv6rnx9igxk55awixi9g3qs21f1"; }; nativeBuildInputs = [ wrapGAppsHook ]; |