diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2016-07-06 00:57:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 00:57:19 +0300 |
| commit | 31daa9b0fb3ec93a7a6d90725f0ce425d9ea722e (patch) | |
| tree | 3a255e8ebe14322b207db26875ff57f1fcc62ad1 /pkgs/applications | |
| parent | 071faa71e7ae4d8a4a7996f1c05d0688a5efddef (diff) | |
| parent | eaeb69c46e83e6bd6f72e425eccf5a982ad29631 (diff) | |
| download | nixlib-31daa9b0fb3ec93a7a6d90725f0ce425d9ea722e.tar nixlib-31daa9b0fb3ec93a7a6d90725f0ce425d9ea722e.tar.gz nixlib-31daa9b0fb3ec93a7a6d90725f0ce425d9ea722e.tar.bz2 nixlib-31daa9b0fb3ec93a7a6d90725f0ce425d9ea722e.tar.lz nixlib-31daa9b0fb3ec93a7a6d90725f0ce425d9ea722e.tar.xz nixlib-31daa9b0fb3ec93a7a6d90725f0ce425d9ea722e.tar.zst nixlib-31daa9b0fb3ec93a7a6d90725f0ce425d9ea722e.zip | |
Merge pull request #16737 from mimadrid/update/cherrytree-0.37.1
cherrytree: 0.35.9 -> 0.37.1
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/cherrytree/default.nix | 14 | ||||
| -rw-r--r-- | 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 97b67a3ae332..72049c21b121 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 cff357a5693b..1f80cde03b75 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 - |