From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:36311) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3AOu-0007Q2-LI for guix-patches@gnu.org; Wed, 28 Aug 2019 22:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3AOs-000707-Ma for guix-patches@gnu.org; Wed, 28 Aug 2019 22:43:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42639) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i3AOs-0006zu-Fg for guix-patches@gnu.org; Wed, 28 Aug 2019 22:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i3AOs-0005Jn-Bl for guix-patches@gnu.org; Wed, 28 Aug 2019 22:43:02 -0400 Subject: [bug#36559] [PATCH] add rednotebook Resent-Message-ID: Message-ID: From: Jesse Gibbons In-Reply-To: <871rx8xpqm.fsf@nicolasgoaziou.fr> References: <20190708222208.71c9d614@gmail.com> <871rx8xpqm.fsf@nicolasgoaziou.fr> Content-Type: multipart/mixed; boundary="=-dr62VRhYLJVkAobjopGH" Date: Wed, 28 Aug 2019 20:42:15 -0600 Mime-Version: 1.0 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: Nicolas Goaziou Cc: 36559@debbugs.gnu.org --=-dr62VRhYLJVkAobjopGH Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Mon, 2019-08-26 at 11:03 +0200, Nicolas Goaziou wrote: > 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 had the discussion soon after I sent the patch. Ricardo convinced me there is at least one good reason for having sources declaring a single package. See https://lists.gnu.org/archive/html/guix-devel/2019-07/msg00240.html for the explanation and the thread. I should have sent a new patch when I decided to rename journal.scm to rednotebook.scm. My mistake. > > > - 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. > fixed. > > + (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. > both fixed. > > + (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? fixed > > > + ("gtk+" ,gtk+) > > Nitpick: spurious spaces. fixed > > > > + ("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" good idea > > > + (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. > fixed > Also, would it make sense to package pyenchant and add it as > a dependency? It's not a blocker though. Added this in a TODO. I also made a list of packages that should be added. It looks like there are four python modules in the rednotebook/external directory that should be packaged externally if possible. > > Could you send an updated patch? attached > > Thank you! > > Regards, > -- -Jesse --=-dr62VRhYLJVkAobjopGH Content-Disposition: attachment; filename="0001-gnu-Add-rednotebook.patch" Content-Type: text/x-patch; name="0001-gnu-Add-rednotebook.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBhNTk2N2JkYmQxNTk4NzQzOGYxNThmMWFlOWJhYzJkYzVhNDRjNjQ1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXNzZSBHaWJib25zIDxqZ2liYm9uczIzNTcrZ3VpeEBnbWFp bC5jb20+CkRhdGU6IFdlZCwgMjggQXVnIDIwMTkgMjA6MzU6MjkgLTA2MDAKU3ViamVjdDogW1BB VENIXSBnbnU6IEFkZCByZWRub3RlYm9vay4KCiAgICAqIGdudS9wYWNrYWdlL3JlZG5vdGVib29r LnNjbTogTmV3IGZpbGUuCiAgICAqIGdudS9sb2NhbC5tazogQWRkIGl0LgogICAgKiBnbnUvcGFj a2FnZXMvcmVkbm90ZWJvb2suc2NtIChyZWRub3RlYm9vayk6IE5ldyB2YXJpYWJsZS4KLS0tCiBn bnUvbG9jYWwubWsgICAgICAgICAgICAgICAgIHwgIDEgKwogZ251L3BhY2thZ2VzL3JlZG5vdGVi b29rLnNjbSB8IDkwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxl cyBjaGFuZ2VkLCA5MSBpbnNlcnRpb25zKCspCiBjcmVhdGUgbW9kZSAxMDA2NDQgZ251L3BhY2th Z2VzL3JlZG5vdGVib29rLnNjbQoKZGlmZiAtLWdpdCBhL2dudS9sb2NhbC5tayBiL2dudS9sb2Nh bC5tawppbmRleCA3OTc5MzZkMmZkLi4yYzAyYjg1MTBhIDEwMDY0NAotLS0gYS9nbnUvbG9jYWwu bWsKKysrIGIvZ251L2xvY2FsLm1rCkBAIC00MTMsNiArNDEzLDcgQEAgR05VX1NZU1RFTV9NT0RV TEVTID0JCQkJXAogICAlRCUvcGFja2FnZXMvcmRmLnNjbQkJCQlcCiAgICVEJS9wYWNrYWdlcy9y ZTJjLnNjbQkJCQlcCiAgICVEJS9wYWNrYWdlcy9yZWFkbGluZS5zY20JCQlcCisgICVEJS9wYWNr YWdlcy9yZWRub3RlYm9vay5zY20JCQlcCiAgICVEJS9wYWNrYWdlcy9yZWdleC5zY20JCQkJXAog ICAlRCUvcGFja2FnZXMvcm9ib3RpY3Muc2NtCQkJXAogICAlRCUvcGFja2FnZXMvcnJkdG9vbC5z Y20JCQlcCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcmVkbm90ZWJvb2suc2NtIGIvZ251L3Bh Y2thZ2VzL3JlZG5vdGVib29rLnNjbQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwLi42MGEyMmE3ZjFmCi0tLSAvZGV2L251bGwKKysrIGIvZ251L3BhY2thZ2VzL3JlZG5vdGVi b29rLnNjbQpAQCAtMCwwICsxLDkwIEBACis7OzsgR05VIEd1aXggLS0tIEZ1bmN0aW9uYWwgcGFj a2FnZSBtYW5hZ2VtZW50IGZvciBHTlUKKzs7OyBDb3B5cmlnaHQgwqkgMjAxOSBKZXNzZSBHaWJi b25zIDxqZ2liYm9uczIzNTcrZ3VpeEBnbWFpbC5jb20+Cis7OzsKKzs7OyBUaGlzIGZpbGUgaXMg cGFydCBvZiBHTlUgR3VpeC4KKzs7OworOzs7IEdOVSBHdWl4IGlzIGZyZWUgc29mdHdhcmU7IHlv dSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkgaXQKKzs7OyB1bmRlciB0aGUgdGVy bXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorOzs7 IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9uIDMgb2YgdGhlIExp Y2Vuc2UsIG9yIChhdAorOzs7IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKzs7Owor Ozs7IEdOVSBHdWl4IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1 c2VmdWwsIGJ1dAorOzs7IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGlt cGxpZWQgd2FycmFudHkgb2YKKzs7OyBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlCis7OzsgR05VIEdlbmVyYWwgUHVibGljIExpY2Vu c2UgZm9yIG1vcmUgZGV0YWlscy4KKzs7OworOzs7IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBh IGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCis7OzsgYWxvbmcgd2l0aCBH TlUgR3VpeC4gIElmIG5vdCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4KKwor KGRlZmluZS1tb2R1bGUgKGdudSBwYWNrYWdlcyByZWRub3RlYm9vaykKKyAgIzp1c2UtbW9kdWxl IChndWl4IHBhY2thZ2VzKQorICAjOnVzZS1tb2R1bGUgKGd1aXggZ2l0LWRvd25sb2FkKQorICAj OnVzZS1tb2R1bGUgKGd1aXggYnVpbGQtc3lzdGVtIHB5dGhvbikKKyAgIzp1c2UtbW9kdWxlICgo Z3VpeCBsaWNlbnNlcykgIzpwcmVmaXggbGljZW5zZTopCisgICM6dXNlLW1vZHVsZSAoZ251IHBh Y2thZ2VzIHB5dGhvbikKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2xpYikKKyAgIzp1 c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ3RrKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdl cyB3ZWJraXQpCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHB5dGhvbi14eXopKQorKGRl ZmluZS1wdWJsaWMgcmVkbm90ZWJvb2sKKyAgKHBhY2thZ2UKKyAgICAobmFtZSAicmVkbm90ZWJv b2siKQorICAgICh2ZXJzaW9uICIyLjExLjEiKQorICAgIChzb3VyY2UKKyAgICAgKG9yaWdpbgor ICAgICAgIChtZXRob2QgZ2l0LWZldGNoKQorICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UKKyAg ICAgICAgICAgICAodXJsICJodHRwczovL2dpdGh1Yi5jb20vamVuZHJpa3NlaXBwL3JlZG5vdGVi b29rLmdpdCIpCisgICAgICAgICAgICAgKGNvbW1pdCAoc3RyaW5nLWFwcGVuZCAidiIgdmVyc2lv bikpKSkKKyAgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCisg ICAgICAgKHNoYTI1NgorICAgICAgICAoYmFzZTMyICIwNGM3YTB3Z21kbDg4djkzODZ5MTA1MmMz OGFqYmtyeWl3aHFwczVseDM0ZDRnN3I2aG0xIikpKSkKKyAgICAoYnVpbGQtc3lzdGVtIHB5dGhv bi1idWlsZC1zeXN0ZW0pCisgICAgKGFyZ3VtZW50cworICAgICA7OyBUZXN0cyBmYWlsIHRvIGZp bmQgdGhlICJfIiBmdW5jdGlvbi4KKyAgICAgOzsgSXQgc2hvdWxkIGJlIGRlZmluZWQgaW4gcmVk bm90ZWJvb2svaW5mby5weSBpZiAnXycgaXMgbm90IGEgbWVtYmVyIG9mCisgICAgIDs7ICdidWls dGlucycuIEl0IGlzIGVpdGhlciBub3QgZGVmaW5lZCBvciBub3QgZXhwb3J0ZWQgZHVyaW5nIHRo ZSBjaGVjaworICAgICA7OyBwaGFzZS4gVGhlIHByb2dyYW0gZG9lcyBub3QgaGF2ZSB0aGlzIHBy b2JsZW0gYWZ0ZXIgaXQgaXMgaW5zdGFsbGVkLgorICAgICA7OyBUT0RPOiBGaXggdGVzdHMuCisg ICAgIGAoIzp0ZXN0cz8gI2YKKyAgICAgICAjOmltcG9ydGVkLW1vZHVsZXMgKChndWl4IGJ1aWxk IGdsaWItb3ItZ3RrLWJ1aWxkLXN5c3RlbSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICxA JXB5dGhvbi1idWlsZC1zeXN0ZW0tbW9kdWxlcykKKyAgICAgICAjOm1vZHVsZXMgKChpY2UtOSBt YXRjaCkKKyAgICAgICAgICAgICAgICAgIChndWl4IGJ1aWxkIHB5dGhvbi1idWlsZC1zeXN0ZW0p CisgICAgICAgICAgICAgICAgICAoKGd1aXggYnVpbGQgZ2xpYi1vci1ndGstYnVpbGQtc3lzdGVt KSAjOnByZWZpeCBnbGliLW9yLWd0azopCisgICAgICAgICAgICAgICAgICAoZ3VpeCBidWlsZCB1 dGlscykpCisgICAgICAgIzpwaGFzZXMKKyAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQt cGhhc2VzCisgICAgICAgICA7OyBNYWtlIHN1cmUgcmVkbm90ZWJvb2sgY2FuIGZpbmQgdGhlIHR5 cGVsaWJzIGFuZCB3ZWJraXRndGsgc2hhcmVkCisgICAgICAgICA7OyBsaWJyYXJpZXMuCisgICAg ICAgICAoYWRkLWJlZm9yZSAnd3JhcCAnd3JhcC13aXRoLWxpYnJhcnktcGF0aHMKKyAgICAgICAg ICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAg ICAgICAgICAgICAobGV0ICgob3V0IChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikpCisgICAgICAg ICAgICAgICAgICAgKGdpLXR5cGVsaWItcGF0aCAoZ2V0ZW52ICJHSV9UWVBFTElCX1BBVEgiKSkK KyAgICAgICAgICAgICAgICAgICAod2Via2l0Z3RrLXBhdGggKHN0cmluZy1hcHBlbmQKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChhc3NvYy1yZWYgaW5wdXRzICJ3ZWJraXRn dGsiKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9saWIiKSkpCisgICAg ICAgICAgICAgICAod3JhcC1wcm9ncmFtIChzdHJpbmctYXBwZW5kIG91dCAiL2Jpbi9yZWRub3Rl Ym9vayIpCisgICAgICAgICAgICAgICAgIGAoIkdJX1RZUEVMSUJfUEFUSCIgIjoiIHByZWZpeCAo LGdpLXR5cGVsaWItcGF0aCkpCisgICAgICAgICAgICAgICAgIGAoIkxEX0xJQlJBUllfUEFUSCIg IjoiIHByZWZpeCAoLHdlYmtpdGd0ay1wYXRoKSkpCisgICAgICAgICAgICAgICAjdCkpKSkpKQor ICAgIChpbnB1dHMKKyAgICAgYCgoImd0aysiICxndGsrKQorICAgICAgICgiZ3Rrc291cmNldmll dyIgLGd0a3NvdXJjZXZpZXctMykKKyAgICAgICAoInB5dGhvbi1weXlhbWwiICxweXRob24tcHl5 YW1sKQorICAgICAgICgicHl0aG9uLXB5Z29iamVjdCIgLHB5dGhvbi1weWdvYmplY3QpCisgICAg ICAgKCJ3ZWJraXRndGsiICx3ZWJraXRndGspKSkKKyAgICA7OyBUT0RPOiBwYWNrYWdlIHRoZSBm b2xsb3dpbmcgIGZvciBweXRob24zIChpZiBwb3NzaWJsZSksIGFkZCB0aGVtIGFzCisgICAgOzsg ZGVwZW5kZW5jaWVzLCBhbmQgcmVtb3ZlIHRoZW0gZnJvbSByZWRub3RlYm9vayBzb3VyY2U6Cisg ICAgOzsgcHlndGtzcGVsbGNoZWNrLCBlbGliLmludGwsIG1zZ2ZtdCwgdHh0MnRhZ3MKKyAgICA7 OyBUT0RPOiBwYWNrYWdlIGFuZCBhZGQgcHllbmNoYW50IGZvciBweXRob24zIGFuZCBhZGQgaXQg YXMgYSBkZXBlbmRlbmN5LgorICAgIChob21lLXBhZ2UgImh0dHBzOi8vd3d3LnJlZG5vdGVib29r LmFwcCIpCisgICAgKHN5bm9wc2lzICJEYWlseSBqb3VybmFsIHdpdGggY2FsZW5kYXIsIHRlbXBs YXRlcyBhbmQga2V5d29yZCBzZWFyY2hpbmciKQorICAgIChkZXNjcmlwdGlvbgorICAgICAiUmVk Tm90ZWJvb2sgaXMgYSBtb2Rlcm4gZGVza3RvcCBqb3VybmFsLiAgSXQgbGV0cyB5b3UgZm9ybWF0 LCB0YWcgYW5kCitzZWFyY2ggeW91ciBlbnRyaWVzLiAgWW91IGNhbiBhbHNvIGFkZCBwaWN0dXJl cywgbGlua3MgYW5kIGN1c3RvbWl6YWJsZQordGVtcGxhdGVzLCBzcGVsbCBjaGVjayB5b3VyIG5v dGVzLCBhbmQgZXhwb3J0IHRvIHBsYWluIHRleHQsIEhUTUwsIExhdGV4IG9yCitQREYuIikKKyAg ICAobGljZW5zZSAobGlzdCBsaWNlbnNlOmdwbDIrICAgICA7IHJlZG5vdGVib29rLCB0eHQydGFn cworICAgICAgICAgICAgICAgICAgIGxpY2Vuc2U6bGdwbDMrICAgIDsgZWxpYi5pbnRsCisgICAg ICAgICAgICAgICAgICAgbGljZW5zZTpncGwzKykpKSkgOyBweWd0a3NwZWxsY2hlY2sKLS0gCjIu MjMuMAoK --=-dr62VRhYLJVkAobjopGH--