From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKXHC-0006Sa-Oh for guix-patches@gnu.org; Sun, 20 May 2018 18:58:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKXH8-0006ow-Rs for guix-patches@gnu.org; Sun, 20 May 2018 18:58:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fKXH8-0006oq-NZ for guix-patches@gnu.org; Sun, 20 May 2018 18:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fKXH8-0003i0-Gt for guix-patches@gnu.org; Sun, 20 May 2018 18:58:02 -0400 Subject: [bug#31540] [PATCH] gnu: xapers: Fix recommended packages Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKXG8-0006Q5-Ux for guix-patches@gnu.org; Sun, 20 May 2018 18:57:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKXG4-0006Xg-To for guix-patches@gnu.org; Sun, 20 May 2018 18:57:01 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:34715) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fKXG4-0006XV-MX for guix-patches@gnu.org; Sun, 20 May 2018 18:56:56 -0400 Received: by mail-qt0-x241.google.com with SMTP id m5-v6so16888374qti.1 for ; Sun, 20 May 2018 15:56:56 -0700 (PDT) Received: from localhost (dyn-160-39-62-188.dyn.columbia.edu. [160.39.62.188]) by smtp.gmail.com with ESMTPSA id r74-v6sm10540641qkh.17.2018.05.20.15.56.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 May 2018 15:56:54 -0700 (PDT) From: Adam Massmann Date: Sun, 20 May 2018 18:56:53 -0400 Message-ID: <874lj25422.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: 31540@debbugs.gnu.org --=-=-= Content-Type: text/plain Hi Guix, Below is a patch to fix/update inputs for xapers. When I originally added xapers I avoided including inputs upstream considers "recommended." After using Guix and xapers some more and thinking about it, I now lean towards including these inputs because in this case not including them will break xapers functionality in undocumented ways, and the recommended packages are relatively modest. However, I am also curious for future use if there is any documentation on standards for handling "recommended" packages (e.g. packages other disdros would assign a "recommended tag" to) in Guix? I couldn't find anything in the manual, but it is very possible I missed something. I also disabled the "xapers-adder" command from spawning an x-terminal program (upstream uses Debian's "x-terminal-emulator"). By disabling this function we avoid pushing an x-terminal program onto users, which I find undesirable (if users need to spawn a terminal they can just wrap xapers-adder e.g. "xterm -e xapers-adder %F"). However, I'm open to other solutions if anyone else has another preference/idea (see comment in patch). Feedback very welcome, and thank you very much for your time/help. Best, Adam --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-xapers-Fix-recommended-packages.patch >From 434455c9be92ecb34e220726dfc75b916e0eaa6c Mon Sep 17 00:00:00 2001 From: Adam Massmann Date: Sun, 20 May 2018 18:50:03 -0400 Subject: [PATCH] gnu: xapers: Fix recommended packages * gnu/packages/search.scm (xapers): [inputs]: remove python, poppler [propagated-inputs]: add poppler, xclip, xdg-utils. [arguments]: modify-phases to disable x-terminal options. --- gnu/packages/search.scm | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 02deb5c4a..5c8539d56 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -32,12 +32,14 @@ #:use-module (gnu packages compression) #:use-module (gnu packages check) #:use-module (gnu packages databases) + #:use-module (gnu packages freedesktop) #: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 xdisorg) #:use-module (gnu packages xml)) (define-public xapian @@ -326,27 +328,52 @@ search the generated indexes.") "0ykz6hn3qj46w3c99d6q0pi5ncq2894simcl7vapv047zm3cylmd")))) (build-system python-build-system) (propagated-inputs - `(("python-urwid" ,python-urwid))) - (inputs `(("poppler" ,poppler) - ("python" ,python) - ("python-latexcodec" ,python-latexcodec) + ("python-urwid" ,python-urwid) + ("xclip" ,xclip) + ("xdg-utils" ,xdg-utils))) + (inputs + `(("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 + `(#:modules ((ice-9 rdelim) + (guix build python-build-system) + (guix build utils)) + #:phases (modify-phases %standard-phases (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) + (define (purge-term-support input output) + (let loop ((line (read-line input))) + (if (string-prefix? "if [[ \"$term\"" line) + (begin (display "eval \"$cmd\"\n" output) + #t) + (begin (display (string-append line "\n") output) + (loop (read-line input)))))) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) + (adder-out (string-append bin "/xapers-adder")) (man1 (string-append out "/share/man/man1"))) (install-file "man/man1/xapers.1" man1) (install-file "man/man1/xapers-adder.1" man1) - (install-file "bin/xapers-adder" bin))))))) + ;; below is equivalent to setting --no-term option + ;; permanently on; this is desirable to avoid imposing + ;; an x-terminal installation on the user but breaks + ;; some potential xapers-adder uses like auto browser + ;; pdf handler, but user could instead still use + ;; e.g. "xterm -e xapers-adder %F" for same use. + ;; alternatively we could propagate xterm as an input + ;; and replace 'x-terminal-emulator' with 'xterm' + (call-with-input-file "bin/xapers-adder" + (lambda (input) + (call-with-output-file adder-out + (lambda (output) + (purge-term-support input output))))) + (chmod adder-out #o555))))))) (home-page "https://finestructure.net/xapers/") (synopsis "Personal document indexing system") (description -- 2.17.0 --=-=-=--