From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:52602) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2Av1-0007OL-AT for guix-patches@gnu.org; Mon, 26 Aug 2019 05:04:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2Auz-0004iF-My for guix-patches@gnu.org; Mon, 26 Aug 2019 05:04:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36768) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2Aux-0004hW-VB for guix-patches@gnu.org; Mon, 26 Aug 2019 05:04:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i2Auv-0005BX-RO for guix-patches@gnu.org; Mon, 26 Aug 2019 05:04:03 -0400 Subject: [bug#36559] [PATCH] add rednotebook Resent-Message-ID: From: Nicolas Goaziou References: <20190708222208.71c9d614@gmail.com> Date: Mon, 26 Aug 2019 11:03:45 +0200 In-Reply-To: <20190708222208.71c9d614@gmail.com> (Jesse Gibbons's message of "Mon, 8 Jul 2019 22:22:08 -0600") Message-ID: <871rx8xpqm.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Jesse Gibbons Cc: 36559@debbugs.gnu.org Hello, Jesse Gibbons writes: > Patch is attached. It looks like this patch felt through the cracks. Do not hesitate to send a friendly ping after one or two weeks if no one responds. > As explained in the comment I had to correct a few problems: > 1. Tests always fail, but (in my experience) the final application is > stable. > 2. rednotebook uses the GI_TYPELIB_PATH and LD_LIBRARY_PATH to find > webkitgtk. > - I made gnu/packages/journal.scm to add other similar journal/diary > applications. Because I do not like naming sources for the only > package defined within, especially when the package is simple, I > recommend moving the jrnl package definition to it. Say the word and > I will produce the patch to do this. It sounds good. > Perhaps we should discuss the idea of organizing packages by function > on the devel mailing list? Feel free to start a discussion about it. > - I also plan to define a package for other journal applications > (like those listed between rednotebook and jrnl at > and > any other recommendations). Great! > Knowing I am likely to err, I expect you (whoever reviews this patch) Some comments follow. > + (source > + (origin > + (method url-fetch) > + (uri (string-append > + "https://github.com/jendrikseipp/rednotebook/archive/v" > + version > + ".tar.gz")) We do not use Github releases, because they are not stable. You should use `git-fetch` here: (method git-fetch) (uri (git-reference (url "https://github.com/jendrikseipp/rednotebook.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) with an appropriate hash. > + (sha256 > + (base32 > + "15n1ziypfj3lzpvhha7r637zrb259l9yrcsvkic9cg5mndiaivs3")))) > + (build-system python-build-system) > + (arguments > + ;;Tests fail to find the "_" function. > + ;;It should be defined in rednotebook/info.py if '_' is not a member of 'builtins'. > + ;;It is either not defined or not exported during the check phase. > + ;;The program does not have this problem after it is installed. > + ;;TODO: Fix tests. Nitpick: missing space between ";;" and "Make". > + `(#:tests? #f > + #:imported-modules ((guix build glib-or-gtk-build-system) > + ,@%python-build-system-modules) > + #:modules ((ice-9 match) > + (guix build python-build-system) > + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) > + (guix build utils)) > + #:phases > + (modify-phases %standard-phases > + ;;Make sure rednotebook can find the typelibs and webkitgtk shared libraries. Ditto. > + (add-before 'wrap 'wrap-with-library-paths > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out")) > + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) > + (webkitgtk-path (string-append > + (assoc-ref inputs "webkitgtk") > + "/lib"))) > + (wrap-program (string-append out "/bin/rednotebook") > + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) > + `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))) > + #t)))))) > + (inputs > + `(("python" ,python-3) I don't think this input is necessary. `python-build-system' should provide it already, shouldn't it? > + ("gtk+" ,gtk+) Nitpick: spurious spaces. > + ("gtksourceview" ,gtksourceview-3) > + ("webkitgtk" ,webkitgtk) > + ("python-pyyaml" ,python-pyyaml))) > + (home-page "https://www.rednotebook.app") > + (synopsis "journal") What about this one, borrowed to Debian: "Daily journal with calendar, templates and keyword searching" > + (description > + "RedNotebook is a modern desktop journal. It lets you format, tag and search > +your entries. You can also add pictures, links and customizable templates, spell > +check your notes, and export to plain text, HTML, Latex or PDF.") You need two spaces after full stops in Texinfo. Also, would it make sense to package pyenchant and add it as a dependency? It's not a blocker though. Could you send an updated patch? Thank you! Regards, -- Nicolas Goaziou