From eaeb69c46e83e6bd6f72e425eccf5a982ad29631 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 5 Jul 2016 22:59:29 +0200
Subject: [PATCH] cherrytree: 0.35.9 -> 0.37.1

---
 pkgs/applications/misc/cherrytree/default.nix      | 14 +++++++-------
 pkgs/applications/misc/cherrytree/subprocess.patch |  7 +++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 97b67a3ae33..72049c21b12 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "cherrytree-${version}";
-  version = "0.35.9";
+  version = "0.37.1";
 
   src = fetchurl {
     url = "http://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "14yahp0y13z3xkpwvprm7q9x3rj6jbzi0bryqlsn3bbafdq7wnac";
+    sha256 = "45f1cee4067598cf2ca8ae6f89d03789b86f9e3bf196236119868653420d7cdd";
   };
 
   propagatedBuildInputs = with pythonPackages;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = { 
+  meta = {
     description = "An hierarchical note taking application";
     longDescription = ''
       Cherrytree is an hierarchical note taking application,
@@ -44,10 +44,10 @@ stdenv.mkDerivation rec {
       documents. All those little bits of information you have scattered
       around your hard drive can be conveniently placed into a
       Cherrytree document where you can easily find it.
-    ''; 
+    '';
     homepage = http://www.giuspen.com/cherrytree;
     license = licenses.gpl3;
-    platforms = platforms.linux; 
-    maintainers = [ maintainers.AndersonTorres ]; 
-  }; 
+    platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
 }
diff --git a/pkgs/applications/misc/cherrytree/subprocess.patch b/pkgs/applications/misc/cherrytree/subprocess.patch
index cff357a5693..1f80cde03b7 100644
--- a/pkgs/applications/misc/cherrytree/subprocess.patch
+++ b/pkgs/applications/misc/cherrytree/subprocess.patch
@@ -1,6 +1,6 @@
-diff -Naur cherrytree-0.35.6-orig/setup.py cherrytree-0.35.6/setup.py
---- cherrytree-0.35.6-orig/setup.py     2014-05-30 23:25:11.000000000 +0200
-+++ cherrytree-0.35.6/setup.py  2015-01-29 07:35:32.785904009 +0100
+diff -Naur cherrytree-0.37.1-orig/setup.py cherrytree-0.37.1/setup.py
+--- cherrytree-0.37.1-orig/setup.py	2016-01-08 20:50:50.000000000 +0100
++++ cherrytree-0.37.1/setup.py	2016-07-05 20:30:27.768178682 +0200
 @@ -205,4 +205,9 @@
            },
         distclass=CherryTreeDist
@@ -12,4 +12,3 @@ diff -Naur cherrytree-0.35.6-orig/setup.py cherrytree-0.35.6/setup.py
 +        pass # handle errors in the called executable
 +    except OSError:
 +        pass # executable not found
-