diff options
Diffstat (limited to 'pkgs/applications/office')
24 files changed, 214 insertions, 72 deletions
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 4e83f36ea527..e32502749dc3 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, gnome3 +, boost, libxslt, goffice, wrapGAppsHook, gnome }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme + libgsf enchant wv libjpeg perl boost libxslt goffice gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 4e8bcaee019e..351609d8c058 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -1,39 +1,50 @@ -{ lib, mkDerivation, fetchFromGitHub, installShellFiles, - qmake, qtbase, poppler, qtmultimedia }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, + qmake, qtbase, qtmultimedia, wrapQtAppsHook, + poppler, mupdf, freetype, jbig2dec, openjpeg, gumbo, + renderer ? "mupdf" }: -mkDerivation rec { +let + renderers = { + mupdf.buildInputs = [ mupdf freetype jbig2dec openjpeg gumbo ]; + poppler.buildInputs = [ poppler ]; + }; + +in + +stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; rev = "v${version}"; - sha256 = "1nbcqrfdjcsc6czqk1v163whka4x1w883b1298aws8yi7vac4f1i"; + sha256 = "10i5nc5b5syaqvsixam4lmfiz3b5cphbjfgfqavi5jilq769792a"; }; - nativeBuildInputs = [ qmake installShellFiles ]; - buildInputs = [ qtbase qtmultimedia poppler ]; + nativeBuildInputs = [ qmake installShellFiles wrapQtAppsHook ]; + buildInputs = [ qtbase qtmultimedia ] ++ renderers.${renderer}.buildInputs; + + qmakeFlags = [ "RENDERER=${renderer}" ]; postPatch = '' - # Fix location of poppler-*.h shopt -s globstar - for f in **/*.{h,cpp}; do - substituteInPlace $f --replace '#include <poppler-' '#include <poppler/qt5/poppler-' + for f in **/*.{pro,conf,h,cpp}; do + substituteInPlace "$f" \ + --replace "/usr/" "$out/" \ + --replace "/etc/" "$out/etc/" \ + --replace '$${GUI_CONFIG_PATH}' "$out/etc/xdg/beamerpresenter/gui.json" done ''; - installPhase = '' - install -m755 beamerpresenter -Dt $out/bin/ - install -m644 src/icons/beamerpresenter.svg -Dt $out/share/icons/hicolor/scalable/apps/ - install -m644 share/applications/beamerpresenter.desktop -Dt $out/share/applications/ - installManPage man/*.{1,5} + postInstall = lib.optionalString stdenv.isDarwin '' + wrapQtApp "$out"/bin/beamerpresenter.app/Contents/MacOS/beamerpresenter ''; meta = with lib; { - description = "Simple dual screen pdf presentation software"; + description = "Modular multi screen pdf presentation software respecting your window manager"; homepage = "https://github.com/stiglers-eponym/BeamerPresenter"; - license = licenses.gpl3Plus; + license = licenses.agpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pacien ]; }; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 8633f1daecdc..88a063158bd1 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -15,6 +15,7 @@ , glib-networking , sqlite , libsoup +, libgdata , gtk3 , pantheon /* granite, icons, maintainers */ , webkitgtk @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { pantheon.granite sqlite webkitgtk + libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 5f6ac503a48a..3d894bcc3d77 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, makeWrapper, cmake, gtest , boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales , webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi , libdbiDrivers, guile, perl, perlPackages @@ -25,13 +25,21 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "sha256-2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no="; + sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w="; }; + patches = [ + # Fix build with GLib 2.68. + (fetchpatch { + url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch"; + sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ="; + }) + ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; buildInputs = [ diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 263a555ab4c1..aacc2a2a579c 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages +, goffice, gnome, wrapGAppsHook, gtk3, bison, python3Packages , itstool }: @@ -20,15 +20,16 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome3.adwaita-icon-theme + goffice gtk3 gnome.adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 9d085b6c8830..1d2d6f0d851d 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -7,7 +7,7 @@ , intltool , wrapGAppsHook , libsoup -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libofx intltool libsoup - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 3b7052dff7f3..4b9237d23ce7 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -11,7 +11,7 @@ , pango , gdk-pixbuf , gobject-introspection -, xvfb_run +, xvfb-run }: python3Packages.buildPythonApplication rec { @@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ nose mock - xvfb_run + xvfb-run ]; preBuild = '' diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index a586cea47ab3..c77c52774be9 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,16 +1,16 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook -, libsoup, gnome3 }: +, libsoup, gnome }: stdenv.mkDerivation rec { - name = "homebank-5.5.1"; + name = "homebank-5.5.2"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "sha256-m7OeqtPExo0ry+IeL2xKUnTjo/OFr7Ky/3OuX9mY2gg="; + sha256 = "sha256-mJ7zeOTJ+CNLYruT1qSxS9TJjciJUZg426H0TxLFHtI="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libofx intltool libsoup - gnome3.adwaita-icon-theme ]; + gnome.adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 98599e713862..8ec16f870ae6 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -8,7 +8,7 @@ , sqlcipher # Needed for running tests: -, qtbase, xvfb_run +, qtbase, xvfb-run , python2, python3Packages }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; - installCheckInputs = [ xvfb_run ]; + installCheckInputs = [ xvfb-run ]; installCheckPhase = lib.optionalString doInstallCheck '' xvfb-run -s '-screen 0 1024x768x24' make test \ diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 90e5995669e8..74fcf1af8f9f 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -2,16 +2,24 @@ python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; - version = "1.0.2"; + version = "unstable-2021-04-01"; -# no tests included in PyPI tarball + # no tests included in PyPI tarball src = fetchFromGitHub { owner = "egh"; repo = "ledger-autosync"; - rev = "v${version}"; - sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk"; + rev = "0b674c57c833f75b1a36d8caf78e1567c8e2180c"; + sha256 = "0q404gr85caib5hg83cnmgx4684l72w9slxyxrwsiwhlf7gm443q"; }; + patches = [ + # ledger-autosync specifies an URL for its ofxparse + # dependency. This patch removes the URL to only use the + # `ofxparse` name. This works because nixpkgs' version of ofxparse + # is more recent than the latest release. + ./fix-ofxparse-dependency.patch + ]; + propagatedBuildInputs = with python3Packages; [ asn1crypto beautifulsoup4 diff --git a/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch b/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch new file mode 100644 index 000000000000..cb12ba9f3351 --- /dev/null +++ b/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index eda6db5..ed6b90b 100644 +--- a/setup.py ++++ b/setup.py +@@ -38,7 +38,7 @@ setup( + install_requires=[ + 'setuptools>=26', + 'ofxclient', +- "ofxparse @ https://github.com/jseutter/ofxparse/tarball/3236cfd96434feb6bc79a8b66f3400f18e2ad3c4" ++ 'ofxparse' + ], + + extras_require={
\ No newline at end of file diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 242add9ce723..e56a3cbc06f5 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, gnome3, glib, ncurses, epoxy, gpgme +, gnome, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null @@ -399,7 +399,7 @@ in (mkDrv rec { mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux librevenge libe-book libmwaw glm ncurses epoxy - libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext + libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 3b8bba9ac19e..f6243476f1b0 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -637,11 +637,11 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.31.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz"; - sha256 = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d"; + name = "neon-0.31.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz"; + sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678"; md5 = ""; - md5name = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d-neon-0.31.1.tar.gz"; + md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; } { name = "nss-3.55-with-nspr-4.27.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index d3fbc261c366..3870c478c803 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "2"; + patch = "3"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1y19p9701msf6jjzp9d5ighvmyjzj68qzhm2bk3l5p16ys8qk9bb"; + sha256 = "1gr9c8kv7nc9kaag1sw9r36843pfba1my80afx7p0lxj0k8pzbrm"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1j5251lbc35d521d92w52lgps0v5pg8mhr8y3r6x2nl9p0gvw957"; + sha256 = "09xkr6jmnwq55savw9xjsy8l8zcyflnsg4nfwhknvm3ls8sqj4w6"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1bsrkmzhhpyrmi7akmdfvz4zb543fc093az9965k14rp8l6rhnvf"; + sha256 = "0dc981vmxfdwlyfgq84axkr99d8chm1ypknj39v0cmaqn56lpwg0"; }; } diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 3e2383fb3565..cb90af5244c6 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -33,7 +33,7 @@ in mkDerivation { description = "Smart manager for information collecting"; homepage = "https://webhamster.ru/site/page/index/articles/projectcode/138"; license = licenses.gpl3; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 7ab5bc838ec0..8271b2974ce4 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { + lib.optionalString withPantheon " - built with Contractor support"; homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2; - maintainers = with maintainers; [ davidak worldofpeace ]; + maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 847287c8c856..e61968391913 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,9 +2,9 @@ , python3Packages , gtk3 , cairo -, gnome3 +, gnome , librsvg -, xvfb_run +, xvfb-run , dbus , libnotify , wrapGAppsHook @@ -12,6 +12,7 @@ , which , gettext , gobject-introspection +, gdk-pixbuf }: python3Packages.buildPythonApplication rec { @@ -53,17 +54,18 @@ python3Packages.buildPythonApplication rec { done ''; - checkInputs = [ xvfb_run dbus.daemon ]; + checkInputs = [ xvfb-run dbus.daemon ]; nativeBuildInputs = [ wrapGAppsHook gobject-introspection (lib.getBin gettext) which + gdk-pixbuf # for the setup hook ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libnotify librsvg gtk3 diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix new file mode 100644 index 000000000000..f4f83ce8e7a7 --- /dev/null +++ b/pkgs/applications/office/timeline/default.nix @@ -0,0 +1,89 @@ +{ lib +, fetchurl +, python3 +, gettext +, makeDesktopItem +, copyDesktopItems +}: + +python3.pkgs.buildPythonApplication rec { + pname = "timeline"; + version = "2.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; + sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23"; + }; + + nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; + + pythonPath = with python3.pkgs; [ + wxPython_4_0 # not compatible with wxPython_4_1. reported upstream https://github.com/wxWidgets/Phoenix/issues/1956 + humblewx + icalendar + markdown + pysvg-py3 + pillow + ]; + + checkInputs = [ + gettext + python3.pkgs.mock + ]; + + desktopItems = [ + (makeDesktopItem { + desktopName = "Timeline"; + name = "timeline"; + comment = "Display and navigate information on a timeline"; + icon = "timeline"; + terminal = false; + exec = "timeline"; + categories = "Office;Calendar;"; + }) + ]; + + dontBuild = true; + doCheck = false; + + patchPhase = '' + sed -i "s|_ROOT =.*|_ROOT = \"$out/usr/share/timeline/\"|" source/timelinelib/config/paths.py + ''; + + installPhase = '' + runHook preInstall + + site_packages=$out/${python3.pkgs.python.sitePackages} + install -D -m755 source/timeline.py $out/bin/timeline + mkdir -p $site_packages + cp -r source/timelinelib $site_packages/ + + mkdir -p $out/usr/share/timeline/locale + cp -r icons $out/usr/share/timeline/ + cp -r translations/ $out/usr/share/timeline/ + + mkdir -p $out/share/icons/hicolor/{48x48,32x32,16x16}/apps + cp icons/48.png $out/share/icons/hicolor/48x48/apps/timeline.png + cp icons/32.png $out/share/icons/hicolor/32x32/apps/timeline.png + cp icons/16.png $out/share/icons/hicolor/16x16/apps/timeline.png + + runHook postInstall + ''; + + # tests fail because they need an x server + # Unable to access the X Display, is $DISPLAY set properly? + checkPhase = '' + runHook preCheck + ${python3.interpreter} tools/execute-specs.py + runHook postCheck + ''; + + meta = with lib; { + homepage = "http://thetimelineproj.sourceforge.net/"; + changelog = "http://thetimelineproj.sourceforge.net/changelog.html"; + description = "Display and navigate information on a timeline"; + license = with licenses; [ gpl3Only cc-by-sa-30 ]; + platforms = with platforms; unix; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 948918e54919..477ae48b5f4b 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -2,22 +2,30 @@ , fetchurl , appimageTools , libsecret +, gtk3 +, gsettings-desktop-schemas }: let - version = "3.4.1"; + version = "3.9.1"; pname = "timeular"; name = "${pname}-${version}"; + src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "1s5jjdl1nzq9yd582lqs904yl10mp0s25897zmifmcbw1vz38bar"; + sha256 = "103hy443p697jdkz6li8s1n6kg1r55jmiw2vbjz12kskf7njg4y4"; }; + appimageContents = appimageTools.extractType2 { inherit name src; }; in appimageTools.wrapType2 rec { inherit name src; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + extraPkgs = pkgs: with pkgs; [ libsecret ]; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index dab4367b3ae4..1cf7f8769d5b 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }: +{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, libxshmfence, wrapGAppsHook }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases"; @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.46.9"; + version = "0.47.2"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1qpk5z8w4wbkxs1lpnz3g8w30zygj4wxxlwj6gp1pip09xgiksm9"; + sha256 = "04fyi0gbih6iw61b6d8lprf9qhxb6zb1pgckmi016wgv8x5ck02p"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1n8g7l6hiw9bhzylvzlfcn2pk4i8pqkqp9lj3lcxwwqb8va52phg"; + sha256 = "1f8csjgqq4yw1qcnlrfy5ysarazmvj2fnmnxj4sr1xjbfa78y2rr"; }; in { @@ -55,7 +55,7 @@ in { wrapGAppsHook ]; - buildInputs = atomEnv.packages ++ [ gtk3 ]; + buildInputs = atomEnv.packages ++ [ gtk3 libxshmfence ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 65eb48f3b2d9..b3a5ae44c936 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -6,7 +6,7 @@ , atk , gtk3 , gtkspell3 -, gnome3 +, gnome , glib , goocanvas2 , gdk-pixbuf @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme goocanvas2 fontconfig freetype diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index c305c7714178..b6e318ec0833 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -4,13 +4,13 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "TailorDev"; repo = "Watson"; rev = version; - sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0"; + sha256 = "0radf5afyphmzphfqb4kkixahds2559nr3yaqvni4xrisdaiaymz"; }; postInstall = '' diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index f34a3e806af7..4cf3c3d78cec 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: # # TODO: Declare configuration options for the following optional dependencies: @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { sha256 = "13vhwsgv6mscgixypc0ixkgj0y7cpcm7z7wn1vmdrwp7kn8m3xgx"; }; - buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 1584972cbebd..53f021344d89 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -26,7 +26,7 @@ , libXrender , libXt , libnotify -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -36,15 +36,15 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.96"; + version = "5.0.96.2"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-W8Iu8UoTqC3aK7lB4bq1L7cNmjaEvjEK+ODcZ9kk3f8="; + sha256 = "sha256-ZT+qxNLjdG29DhyV0JXtgDHDi2gYPyKrZwgJOro5III="; }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome3.adwaita-icon-theme dconf ]; + buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; |