From b20a82cd7592ad8ebcfb1e94ce5b44f067355b83 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 25 Apr 2018 09:38:17 +0800
Subject: calligra: 3.0.1 -> 3.1.0

---
 pkgs/applications/office/calligra/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'pkgs/applications/office/calligra/default.nix')

diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 8449cdf05de..01014e6687c 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -15,24 +15,16 @@
 
 mkDerivation rec {
   pname = "calligra";
-  version = "3.0.1";
+  version = "3.1.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
-    sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5";
+    sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
   };
 
   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 = [
-- 
cgit 1.4.1