diff options
| author | OPNA2608 <christoph.neidahl@gmail.com> | 2021-06-10 21:44:42 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-21 19:08:43 +0000 |
| commit | 5eb152a76f4f8b128b464c2e88039cbc1704c1bd (patch) | |
| tree | 069d1f84a23a5c0a4a9b684a164a84a57579bdb7 | |
| parent | gtksourceviewmm: Enable building on Darwin (diff) | |
| download | nixpkgs-origin/backport-126490-to-release-21.05.tar.gz | |
cherrytree: 0.39.4 -> 0.99.37origin/backport-126490-to-release-21.05
(cherry picked from commit dad76cf9da17ba4e53ab41385a7d330a5204bf0e)
| -rw-r--r-- | pkgs/applications/misc/cherrytree/default.nix | 55 | ||||
| -rw-r--r-- | pkgs/applications/misc/cherrytree/subprocess.patch | 14 |
2 files changed, 42 insertions, 27 deletions
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 0ce89afa6cea..585f62178611 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,24 +1,52 @@ -{ lib, fetchFromGitHub, python2Packages, gettext }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, python3 +, wrapGAppsHook +, gtkmm3 +, gtksourceview +, gtksourceviewmm +, gspell +, libxmlxx +, sqlite +, curl +, libuchardet +, fmt +, spdlog +}: -python2Packages.buildPythonApplication rec { +stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.39.4"; + version = "0.99.37"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "1wycgn1f3b858qb6kn2bsaabak8n52qkpd24w54xz6fjizlnw7x0"; - + sha256 = "1a2scwjrjijxwyfpqih23zzay3yqhyzpxnp66388fcir1cmp8zih"; }; - nativeBuildInputs = [ gettext ]; - - propagatedBuildInputs = with python2Packages; [ pygtk dbus-python pygtksourceview ]; - - patches = [ ./subprocess.patch ]; + nativeBuildInputs = [ + cmake + pkg-config + python3 + wrapGAppsHook + ]; - doCheck = false; + buildInputs = [ + gtkmm3 + gtksourceview + gtksourceviewmm + gspell + libxmlxx + sqlite + curl + libuchardet + fmt + spdlog + ]; meta = with lib; { description = "An hierarchical note taking application"; @@ -31,8 +59,9 @@ python2Packages.buildPythonApplication rec { 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; + homepage = "https://www.giuspen.com/cherrytree"; + changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/cherrytree/subprocess.patch b/pkgs/applications/misc/cherrytree/subprocess.patch deleted file mode 100644 index 1f80cde03b75..000000000000 --- a/pkgs/applications/misc/cherrytree/subprocess.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 - ) -- subprocess.call("update-desktop-database") -+ try: -+ subprocess.check_call(['update-desktop-database']) -+ except subprocess.CalledProcessError: -+ pass # handle errors in the called executable -+ except OSError: -+ pass # executable not found |