From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f385X-0004nN-RD for guix-patches@gnu.org; Mon, 02 Apr 2018 18:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f385S-0007fu-ST for guix-patches@gnu.org; Mon, 02 Apr 2018 18:38:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:55894) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f385S-0007fP-MW for guix-patches@gnu.org; Mon, 02 Apr 2018 18:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f385S-00012T-EG for guix-patches@gnu.org; Mon, 02 Apr 2018 18:38:02 -0400 Subject: [bug#31007] [PATCH] gnu: Add xapers. Resent-Message-ID: Date: Mon, 2 Apr 2018 17:37:32 -0500 From: Eric Bavier Message-ID: <20180402173732.520974f3@centurylink.net> In-Reply-To: <87bmf42khy.fsf@gmail.com> References: <87bmf42khy.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/uf8Q0J6QMXmaRv8RGnZDjkI"; protocol="application/pgp-signature" 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: Adam Massmann Cc: 31007@debbugs.gnu.org --Sig_/uf8Q0J6QMXmaRv8RGnZDjkI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hello Adam, On Sat, 31 Mar 2018 14:00:25 -0400 Adam Massmann wrote: > Hi, >=20 > This is a patch to add xapers (https://finestructure.net/xapers/) and > dependencies. I followed the steps in Contributing: Submitting Patches, > but this is my first time contributing so I apologize if I made any > mistakes. Welcome! Thank you for your contribution. > Thanks a lot for the work on Guix, I've really enjoyed using it. Glad you've enjoyed it. Just a few suggestions: First, could you add a copyright line for yourself on each of the affected files? > --- > gnu/packages/python.scm | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) >=20 > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index 9e038ef4f..f505f15b2 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -13082,3 +13082,22 @@ file system events on Linux.") > (base32 > "0svc9nla3b9145d6b7fb9dizx412l3difzqw0ilh9lz52nsixw8j")) > (file-name (string-append name "-" version ".tar.gz")))))) > + > +(define-public python-latexcodec > + (package > + (name "python-latexcodec") [...] > + (synopsis "Lexer and codec to work with LaTeX code in Python") Maybe leave out the "Lexer and codec to" bit so this becomes "Work with LaTeX code in Python" to make the synopsis more approachable. >=20 >=20 > From f506eb11811eef1461b382d6d3cbcc273e62ad3d Mon Sep 17 00:00:00 2001 > From: Adam Massmann > Date: Sat, 31 Mar 2018 13:08:11 -0400 > Subject: [PATCH 2/3] gnu: Add python-pybtex. >=20 > --- > gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) >=20 > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index f505f15b2..056a05235 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -13101,3 +13101,35 @@ file system events on Linux.") > (synopsis "Lexer and codec to work with LaTeX code in Python") > (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 > + `(#:phases > + (modify-phases %standard-phases > + (replace 'check > + ;; hack, where did the tests go? > + (lambda _ > + (zero? 0)))))) Could you use "#:tests? #f" instead, and expand on exactly why the tests are not being run (seems there are none?). > +(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-xapian-bindings" ,python-xapian-bindings) > + ("python-pycurl" ,python-pycurl) > + ("python-latexcodec" ,python-latexcodec) > + ("python-pybtex" ,python-pybtex) > + ("python-pyyaml" ,python-pyyaml) > + ("python-six" ,python-six))) > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + (add-after > + 'install 'install-doc Put these on the same line as "add-after". > + (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"))) > + (mkdir-p bin) > + (mkdir-p man1) > + (copy-file "man/man1/xapers.1" > + (string-append man1 "/xapers.1")) > + (copy-file "man/man1/xapers-adder.1" > + (string-append man1 "/xapers-adder.1")) > + (copy-file "bin/xapers-adder" > + (string-append bin "/xapers-adder")))))))) ^ Use "install-file" here. It also creates the target directory, so you can remove the mkdir-p's above. Otherwise looks good to me. Could you send an updated patch? Thanks, `~Eric --Sig_/uf8Q0J6QMXmaRv8RGnZDjkI Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlrCsKwACgkQ/XPKxxnT JWaNgw//e7gt5dEbLexGh0Q4S71656v6pLj//vixq7hQybwYIVti03t7Rqvmru22 Z83qWjbyP8YlHnX9+B8uNjjeocndQB+BxUqYv549XzLt3Nd4c5tJ/Ph6CrLxK3q6 p8loJ65xHcOf6KINXZ1xManyL7I/IyfKRwRdwTFRxEN9Y/cOS4CrEtw3mi5IqiFE 3Q1pnzRQoaytgPTsop+/xgyxK81seGLM4UBN6+iDdy6hRDNqp5Rapj2hGnjII/jO RtGDBzjmxuMxpQz0h7xz0ULfC/1cfOKRy3Zuq5+/6vTLBijP6TCwv7QIAnUgBWUG VH5woxuGrzZrRtlBxOzxV0i66fXPE4vyL98ncPvrV8Ji+K4w5iAeF8EPf54/6eLm PlXYYGbJD9YnunL28RqpydF1fUp31ayPYUMo4XNDxWQ4RGBDIR00U2//gTSKdgDF iHTDZdEN0sF0LQegYdRC4uWYBzHQ8P5nusgxteMy9LM4Vdyoh0yRBLQnXu0PYLbi svJ6YWUX1bLW456+8iYGag03JQR3STI+V+JBW1bgZJvV0SIszm8/NlOdgPzWtrGC U9StS+YI73lDjhQlNc1weAvTuwiCbymEX5Y0DbvDa7iV6BTrOrTKJ3uXK/Z23RgZ jY2anskFaXONe5F263TF8e180COD1LVMcRDCXdUK2waWnGAnwx4= =NiNx -----END PGP SIGNATURE----- --Sig_/uf8Q0J6QMXmaRv8RGnZDjkI--