diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-08 20:59:05 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-08 20:59:05 +0200 |
commit | dd78ce1c531d9859014c654a480550b1673d02ca (patch) | |
tree | 16517c8251aba59630e09a61052dced3981cf163 /pkgs/applications/office | |
parent | 252bf94a74adcc076b0c07550c1a41171709edc1 (diff) | |
parent | 6d46d8a9b9bc7fbb9e0d341ee7d3fed503236ebb (diff) | |
download | nixpkgs-dd78ce1c531d9859014c654a480550b1673d02ca.tar nixpkgs-dd78ce1c531d9859014c654a480550b1673d02ca.tar.gz nixpkgs-dd78ce1c531d9859014c654a480550b1673d02ca.tar.bz2 nixpkgs-dd78ce1c531d9859014c654a480550b1673d02ca.tar.lz nixpkgs-dd78ce1c531d9859014c654a480550b1673d02ca.tar.xz nixpkgs-dd78ce1c531d9859014c654a480550b1673d02ca.tar.zst nixpkgs-dd78ce1c531d9859014c654a480550b1673d02ca.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/abiword/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/gnumeric/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/office/grisbi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/gtg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/homebank/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/kmymoney/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/ledger-autosync/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch | 13 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/notes-up/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/paperwork/paperwork-gtk.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/office/tryton/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/zim/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/zotero/default.nix | 4 |
14 files changed, 51 insertions, 30 deletions
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 4e83f36ea52..e32502749dc 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/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index f65781352b3..aacc2a2a579 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,14 +20,14 @@ 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 9d085b6c883..1d2d6f0d851 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 3b7052dff7f..4b9237d23ce 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 a586cea47ab..b7da8c777a9 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook -, libsoup, gnome3 }: +, libsoup, gnome }: stdenv.mkDerivation rec { name = "homebank-5.5.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { 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 1d8a214c818..95da79cca4f 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 90e5995669e..74fcf1af8f9 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 00000000000..cb12ba9f335 --- /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 c9b1099f8b9..1c5327ebc6c 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/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 7ab5bc838ec..8271b2974ce 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 847287c8c85..3bf9f1af9a5 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 @@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec { done ''; - checkInputs = [ xvfb_run dbus.daemon ]; + checkInputs = [ xvfb-run dbus.daemon ]; nativeBuildInputs = [ wrapGAppsHook @@ -63,7 +63,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libnotify librsvg gtk3 diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 65eb48f3b2d..b3a5ae44c93 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/zim/default.nix b/pkgs/applications/office/zim/default.nix index f34a3e806af..4cf3c3d78ce 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 1584972cbeb..99fd54c5cc7 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 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; 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; |