From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3c8R-0005oy-7w for guix-patches@gnu.org; Wed, 04 Apr 2018 02:43:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3c8N-0000mz-0R for guix-patches@gnu.org; Wed, 04 Apr 2018 02:43:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57875) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f3c8M-0000mh-MK for guix-patches@gnu.org; Wed, 04 Apr 2018 02:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f3c8M-0006TJ-64 for guix-patches@gnu.org; Wed, 04 Apr 2018 02:43:02 -0400 Subject: [bug#31007] [PATCH] gnu: Add xapers. Resent-Message-ID: From: Adam Massmann In-Reply-To: <20180402173732.520974f3@centurylink.net> (Eric Bavier's message of "Mon, 2 Apr 2018 17:37:32 -0500") References: <87bmf42khy.fsf@gmail.com> <20180402173732.520974f3@centurylink.net> Date: Wed, 04 Apr 2018 02:42:34 -0400 Message-ID: <87efjvqxph.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: ericbavier@centurylink.net, 31007@debbugs.gnu.org --=-=-= Content-Type: text/plain Hi Eric, Thank you very much for reviewing the patch and providing the feedback. I was able to make the fixes you pointed out and attached the updated patches below. I also fixed some mistakes on alphabetical order I had missed. While digging more into the missing tests for pybtex I realized that the problems with tests were actually an error on my part - I apologize! I misinterpreted some output as suggesting that tests were missing, when in reality I was letting Guix send the wrong test target to python-build. This is fixed now and the tests work. Thanks again for your time spent on the contribution; it's a big help particularly for someone new to this like me. Best, Adam --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-python-latexcodec.patch Content-Transfer-Encoding: quoted-printable Content-Description: gnu: Add python-latexcodec >From 255654e8bed9df609c824f4687ef0b673bcc3c09 Mon Sep 17 00:00:00 2001 From: Adam Massmann Date: Wed, 4 Apr 2018 02:09:28 -0400 Subject: [PATCH 1/3] gnu: Add python-latexcodec --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9e038ef4f..946bf7916 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -48,6 +48,7 @@ ;;; Copyright =C2=A9 2018 Ethan R. Jones ;;; Copyright =C2=A9 2018 Vijayalakshmi Vedantham +;;; Copyright =C2=A9 2018 Adam Massmann =20 ;;; This file is part of GNU Guix. ;;; @@ -13082,3 +13083,24 @@ file system events on Linux.") (base32 "0svc9nla3b9145d6b7fb9dizx412l3difzqw0ilh9lz52nsixw8j")) (file-name (string-append name "-" version ".tar.gz")))))) + +(define-public python-latexcodec + (package + (name "python-latexcodec") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "latexcodec" version)) + (sha256 + (base32 + "0zdd1gf24i83ykadx0y30n3001j43scqr2saql3vckk5c39dj1wn")))) + (build-system python-build-system) + (inputs + `(("python-six" ,python-six))) + (home-page "https://readthedocs.org/projects/latexcodec/") + (synopsis "Work with LaTeX code in Python") + (description "Lexer and codec to work with LaTeX code in Python.") + (license license:expat))) + + --=20 2.11.0 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-Add-python-pybtex.patch Content-Description: gnu: Add python-pybtex >From 175d4c538b997485500aae112ac734ec452a242f Mon Sep 17 00:00:00 2001 From: Adam Massmann Date: Wed, 4 Apr 2018 02:10:32 -0400 Subject: [PATCH 2/3] gnu: Add python-pybtex --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 946bf7916..d874b4e3d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13103,4 +13103,30 @@ file system events on Linux.") (description "Lexer and codec to work with LaTeX code in Python.") (license license:expat))) +(define-public python-pybtex + (package + (name "python-pybtex") + (version "0.21") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pybtex" version)) + (sha256 + (base32 + "00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (inputs + `(("python-latexcodec" ,python-latexcodec) + ("python-pyyaml" ,python-pyyaml) + ("python-six" ,python-six))) + (arguments + `(#:test-target "nosetests")) + (home-page "https://pybtex.org/") + (synopsis "BibTeX-compatible bibliography processor") + (description "Pybtex is a BibTeX-compatible bibliography +processor written in Python. +You can simply type pybtex instead of bibtex.") + (license license:expat))) -- 2.11.0 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0003-gnu-Add-xapers.patch Content-Transfer-Encoding: quoted-printable Content-Description: gnu: Add xapers >From 0dd76dc1b5f89500ba4e9dcfbe34fca6a5f9c48e Mon Sep 17 00:00:00 2001 From: Adam Massmann Date: Wed, 4 Apr 2018 02:13:30 -0400 Subject: [PATCH 3/3] gnu: Add xapers --- gnu/packages/search.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index a71981992..64846cffe 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2015, 2016 Eric Bavier ;;; Copyright =C2=A9 2017 Thomas Danckaert ;;; Copyright =C2=A9 2017 Ricardo Wurmus +;;; Copyright =C2=A9 2018 Adam Massmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,13 +27,16 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages linux) #:use-module (gnu packages perl) + #:use-module (gnu packages pdf) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages web) #:use-module (gnu packages xml)) =20 @@ -307,4 +311,53 @@ can quickly and easily index directories of files or r= emote web sites and search the generated indexes.") (license gpl2+))) ;with exception =20 +(define-public xapers + (package + (name "xapers") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://finestructure.net/xapers/releases/xapers-" + version ".tar.gz")) + (sha256 + (base32 + "0ykz6hn3qj46w3c99d6q0pi5ncq2894simcl7vapv047zm3cylmd")))) + (build-system python-build-system) + (propagated-inputs + `(("python-urwid" ,python-urwid))) + (inputs + `(("poppler" ,poppler) + ("python" ,python) + ("python-latexcodec" ,python-latexcodec) + ("python-pybtex" ,python-pybtex) + ("python-pycurl" ,python-pycurl) + ("python-pyyaml" ,python-pyyaml) + ("python-six" ,python-six) + ("python-xapian-bindings" ,python-xapian-bindings))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man1 (string-append out "/share/man/man1"))) + (install-file "man/man1/xapers.1" + (string-append man1 "/xapers.1")) + (install-file "man/man1/xapers-adder.1" + (string-append man1 "/xapers-adder.1")) + (install-file "bin/xapers-adder" + (string-append bin "/xapers-adder")))))))) + (home-page "https://finestructure.net/xapers/") + (synopsis "Personal document indexing system") + (description + "Xapers is a personal document indexing system, +geared towards academic journal articles build on the Xapian search engine. +Think of it as your own personal document search engine, or a local cache = of +online libraries. It provides fast search of document text and +bibliographic data and simple document and bibtex retrieval.") + (license gpl3+))) + ;;; search.scm ends here --=20 2.11.0 --=-=-=--