Merge branch 'master' into staging

Hydra: ?compare=1421760

4 files changed, 20 insertions, 75 deletions

diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix
deleted file mode 100644
index 959a44a35c10..000000000000
--- a/pkgs/applications/office/calligra/2.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
-, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
-, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
-, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
-, kactivities, okular, git, oxygen-icons5, makeWrapper
-# TODO: not found
-#, xbase, openjpeg
-# TODO: package libWPS, Spnav, m2mml, LibEtonyek
-}:
-
-stdenv.mkDerivation rec {
-  name = "calligra-2.9.11";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${name}/${name}.tar.xz";
-    sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
-
-  buildInputs = [
-    kdelibs4 lcms2 libpng eigen
-    exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
-    libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
-    freetds fftw glew libkdcraw opencolorio kdepimlibs
-    kactivities okular git
-  ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    for i in $out/bin/*; do
-      wrapProgram $i \
-        --prefix PATH ':' "${pstoedit.out}/bin" \
-        --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A suite of productivity applications";
-    longDescription = ''
-      Calligra Suite is a set of applications written to help
-      you to accomplish your work. Calligra includes efficient
-      and capable office components: Words for text processing,
-      Sheets for computations, Stage for presentations, Plan for
-      planning, Flow for flowcharts, Kexi for database creation,
-      Krita for painting and raster drawing, and Karbon for
-      vector graphics.
-    '';
-    homepage = http://calligra.org;
-    maintainers = with maintainers; [ phreedom ebzzry ];
-    inherit (kdelibs4.meta) platforms;
-    license = licenses.gpl2;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index bec19d675cb0..1537dd9b03ff 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
+  mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper,
   boost, qtwebkit, qtx11extras, shared_mime_info,
   breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
   kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
@@ -23,6 +23,16 @@ mkDerivation rec {
     sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5";
   };
 
+  enableParallelBuilding = true;
+
+  patches = [
+    (fetchpatch {
+      name = "calligra-build-with-newer-kcalcore.patch";
+      url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff";
+      sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0";
+    })
+  ];
+
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
 
   buildInputs = [
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 42d8abf49bdb..679afaa2dce5 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -6,7 +6,7 @@
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
@@ -15,7 +15,6 @@
 , defaultIconTheme, glib, ncurses
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
 , withHelp ? true
-, kdeIntegration ? false
 }:
 
 let
@@ -187,7 +186,6 @@ in stdenv.mkDerivation rec {
     "--disable-report-builder"
     "--enable-python=system"
     "--enable-dbus"
-    (lib.enableFeature kdeIntegration "kde4")
     "--with-package-format=installed"
     "--enable-epm"
     "--with-jdk-home=${jdk.home}"
@@ -250,8 +248,7 @@ in stdenv.mkDerivation rec {
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew ncurses
       libodfgen CoinMP librdf_rasqal defaultIconTheme
-    ]
-    ++ lib.optional kdeIntegration kdelibs4;
+    ];
   nativeBuildInputs = [ wrapGAppsHook ];
 
   passthru = {
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 2130e64a2a3a..f8785616c5e6 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  fetchurl, fetchpatch,
+  fetchFromGitHub,
   extra-cmake-modules,
   qtbase, boost,
   akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap,
@@ -9,22 +9,16 @@
 
 mkDerivation rec {
   pname = "zanshin";
-  version = "0.4.1";
+  version = "2017-11-25";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://files.kde.org/${pname}/${name}.tar.bz2";
-    sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as";
+  src = fetchFromGitHub {
+    owner = "KDE";
+    repo = "zanshin";
+    rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89";
+    sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "zanshin-fix-qt59-build.patch";
-      url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1";
-      sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x";
-    })
-  ];
-
   nativeBuildInputs = [
     extra-cmake-modules
   ];