public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16737 from mimadrid/update/cherrytree-0.37.1

Browse Source 
cherrytree: 0.35.9 -> 0.37.1
This commit is contained in:
Tuomas Tynkkynen 2016-07-06 00:57:19 +03:00 committed by GitHub
commit 31daa9b0fb
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/cherrytree/default.nix
View File

@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cherrytree-${version}"; name = "cherrytree-${version}";
version = "0.35.9"; version = "0.37.1";
src = fetchurl { src = fetchurl {
url = "http://www.giuspen.com/software/${name}.tar.xz"; url = "http://www.giuspen.com/software/${name}.tar.xz";
sha256 = "14yahp0y13z3xkpwvprm7q9x3rj6jbzi0bryqlsn3bbafdq7wnac"; sha256 = "45f1cee4067598cf2ca8ae6f89d03789b86f9e3bf196236119868653420d7cdd";
}; };
propagatedBuildInputs = with pythonPackages; propagatedBuildInputs = with pythonPackages;

7
pkgs/applications/misc/cherrytree/subprocess.patch
View File

@ -1,6 +1,6 @@
diff -Naur cherrytree-0.35.6-orig/setup.py cherrytree-0.35.6/setup.py diff -Naur cherrytree-0.37.1-orig/setup.py cherrytree-0.37.1/setup.py
--- cherrytree-0.35.6-orig/setup.py 2014-05-30 23:25:11.000000000 +0200 --- cherrytree-0.37.1-orig/setup.py 2016-01-08 20:50:50.000000000 +0100
+++ cherrytree-0.35.6/setup.py 2015-01-29 07:35:32.785904009 +0100 +++ cherrytree-0.37.1/setup.py 2016-07-05 20:30:27.768178682 +0200
@@ -205,4 +205,9 @@ @@ -205,4 +205,9 @@
}, },
distclass=CherryTreeDist 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 + pass # handle errors in the called executable
+ except OSError: + except OSError:
+ pass # executable not found + pass # executable not found