summary refs log tree commit diff
path: root/pkgs/applications/office/calligra/default.nix
diff options
context:
space:
mode:
authoradisbladis <adis@blad.is>2018-04-25 09:38:17 +0800
committeradisbladis <adis@blad.is>2018-04-25 09:40:26 +0800
commitb20a82cd7592ad8ebcfb1e94ce5b44f067355b83 (patch)
tree117a85763fe44ba14d838aafd6dd640f2052b29a /pkgs/applications/office/calligra/default.nix
parent1bde5c59307f1e2d8f786f366f5171f04d60c1e9 (diff)
downloadnixpkgs-b20a82cd7592ad8ebcfb1e94ce5b44f067355b83.tar
nixpkgs-b20a82cd7592ad8ebcfb1e94ce5b44f067355b83.tar.gz
nixpkgs-b20a82cd7592ad8ebcfb1e94ce5b44f067355b83.tar.bz2
nixpkgs-b20a82cd7592ad8ebcfb1e94ce5b44f067355b83.tar.lz
nixpkgs-b20a82cd7592ad8ebcfb1e94ce5b44f067355b83.tar.xz
nixpkgs-b20a82cd7592ad8ebcfb1e94ce5b44f067355b83.tar.zst
nixpkgs-b20a82cd7592ad8ebcfb1e94ce5b44f067355b83.zip
calligra: 3.0.1 -> 3.1.0
Diffstat (limited to 'pkgs/applications/office/calligra/default.nix')
-rw-r--r--pkgs/applications/office/calligra/default.nix12
1 files changed, 2 insertions, 10 deletions
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 = [