From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oEC/BfYALmGNrAAAgWs5BA (envelope-from ) for ; Tue, 31 Aug 2021 12:14:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MIJgAfYALmEoWwAAB5/wlQ (envelope-from ) for ; Tue, 31 Aug 2021 10:14:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BA5B31C3E7 for ; Tue, 31 Aug 2021 12:14:13 +0200 (CEST) Received: from localhost ([::1]:36582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mL0mS-00056s-ON for larch@yhetil.org; Tue, 31 Aug 2021 06:14:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mL0mI-00055i-M3 for guix-patches@gnu.org; Tue, 31 Aug 2021 06:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49792) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mL0mI-0005t4-3h for guix-patches@gnu.org; Tue, 31 Aug 2021 06:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mL0mH-00036x-Pc for guix-patches@gnu.org; Tue, 31 Aug 2021 06:14:01 -0400 Subject: bug#50162: [PATCH] gnu: global: Add ctags support. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 10:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 50162 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 50162-done@debbugs.gnu.org Received: via spool by 50162-done@debbugs.gnu.org id=D50162.163040482211922 (code D ref 50162); Tue, 31 Aug 2021 10:14:01 +0000 Received: (at 50162-done) by debbugs.gnu.org; 31 Aug 2021 10:13:42 +0000 Received: from localhost ([127.0.0.1]:33105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mL0lx-00036E-KN for submit@debbugs.gnu.org; Tue, 31 Aug 2021 06:13:42 -0400 Received: from flashner.co.il ([178.62.234.194]:55918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mL0lu-00035z-35 for 50162-done@debbugs.gnu.org; Tue, 31 Aug 2021 06:13:40 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 92674406CB; Tue, 31 Aug 2021 10:13:31 +0000 (UTC) Date: Tue, 31 Aug 2021 13:11:14 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , Maxim Cournoyer , 50162-done@debbugs.gnu.org References: <086db0822919d2c43b93dccd3f88be8588685b2f.1629619162.git.efraim@flashner.co.il> <87h7f6ln7w.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="PvyDOQWNQAr9zFUn" Content-Disposition: inline In-Reply-To: <87h7f6ln7w.fsf@gmail.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630404853; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=brnUgsTF5+2ezbgCZKagyDfm7oYW/eMLS+8jm/U3Vrk=; b=QsTcaibj8NWh4J+IRhf/91swAfIUdQG1vSstntRxiA7l+pDMR1R/hw+XIE5SM18HL7RXOv h79QgfApEdFFAhIGRGwiShJBClaT+ORaCw9qbJM1GTNlgEwx7JfI1K45Q3pcyxWXqHe+b/ DLHwV08oJrw5+Imf723hrYbWN4qBVViDE2i+UqriCdCNKmYTKNltuWLfSiQT1vcDicZaSs kyuHFL5KEX98cHDPPKhREf/4cbN77mVTUtFcNyKGZy4pjHHBbeyxCQK5EzL58pvyKYn2jQ 9UfjbVkeusWomTZnZShMcZsax0fwmTJ8VrviG9AoJw7BpFJUaNptTf9Xq3cpJw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630404853; a=rsa-sha256; cv=none; b=r2w8uAKkzZoy1uzwemuQOn0YUWcnn9vJS4SbzoIKAarevEjKlamtwzg0TEKAQjK3yiqTQF mMjM9IRugAswcKsizZSkYK8Kd7rrPF9y9VY0UZ+XX5+WjlFPefTf5o3IkeGPKgIVOjNUBG BZd9m7mZog1vQX3YouZbXi4nSjnyeQT+4bV+huiyaRYTYp/sAlJYcD2CeJdISs2SPL3zcO 0NeUIqYGBlh8xkfclqcY9OOPGeG/7eCtfa/YmwkjlZDRlj3KmRQM6OvOYkyIGxkjZlNcKH Oga4MY+nSP62Y59mdIQ430JZwYZFLgjA8R6gL44Byqfy6SGN7aeoV8OPGoS7Sw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -4.02 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: BA5B31C3E7 X-Spam-Score: -4.02 X-Migadu-Scanner: scn0.migadu.com X-TUID: f4TRdffuDetf --PvyDOQWNQAr9zFUn Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Aug 30, 2021 at 03:57:39PM -0400, Maxim Cournoyer wrote: > Hello! >=20 > Efraim Flashner writes: >=20 > > * gnu/packages/code.scm (global)[inputs]: Add bash-minimal, > > universal-ctags, python-pygments. > > [arguments]: Add configure-flags to find ctags. Add phases to install > > plugins and to wrap python script with PYTHONPATH. > > --- > > > > I've been using this variant of global for a couple of weeks now to get > > global to work with Guix. > > > > --- > > > > gnu/packages/code.scm | 34 +++++++++++++++++++++++++++++----- > > 1 file changed, 29 insertions(+), 5 deletions(-) > > > > diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm > > index a414cde3de..04b354b71e 100644 > > --- a/gnu/packages/code.scm > > +++ b/gnu/packages/code.scm > > @@ -64,6 +64,7 @@ > > #:use-module (gnu packages perl-compression) > > #:use-module (gnu packages pkg-config) > > #:use-module (gnu packages python) > > + #:use-module (gnu packages python-xyz) > > #:use-module (gnu packages serialization) > > #:use-module (gnu packages sqlite) > > #:use-module (gnu packages texinfo) > > @@ -137,17 +138,26 @@ highlighting your own code that seemed comprehens= ible when you wrote it.") > > (base32 > > "0g4aslm2zajq605py11s4rs1wdnzcqhkh7bc2xl5az42adzzg839")= ))) > > (build-system gnu-build-system) > > - (inputs `(("coreutils" ,coreutils) > > - ("ncurses" ,ncurses) > > - ("libltdl" ,libltdl) > > - ("sqlite" ,sqlite) > > - ("python-wrapper" ,python-wrapper))) > > + (inputs > > + `(("bash" ,bash-minimal) ; for wrap-program >=20 > This is news to me; must we now provide bash-minimal every time > wrap-program is used? Its new, I think the aim was to make sure that even if a package is cross compiled it uses the correct bash when wrapping the program/script. > > + ("coreutils" ,coreutils) > > + ("ctags" ,universal-ctags) > > + ("libltdl" ,libltdl) > > + ("ncurses" ,ncurses) > > + ("python-pygments" ,python-pygments) > > + ("python-wrapper" ,python-wrapper) > > + ("sqlite" ,sqlite))) > > (arguments > > `(#:configure-flags > > (list (string-append "--with-ncurses=3D" > > (assoc-ref %build-inputs "ncurses")) > > (string-append "--with-sqlite3=3D" > > (assoc-ref %build-inputs "sqlite")) > > + (string-append "--with-universal-ctags=3D" > > + (assoc-ref %build-inputs "ctags") "/bin/ct= ags") > > + (string-append "--sysconfdir=3D" > > + (assoc-ref %outputs "out") "/share/gtags") > > + "--localstatedir=3D/var" ; This needs to be a wri= table location. > > "--disable-static") > > =20 > > #:phases > > @@ -158,6 +168,20 @@ highlighting your own code that seemed comprehensi= ble when you wrote it.") > > (assoc-ref inputs "coreutils") "/bin/echo")= )) > > (substitute* "globash/globash.in" > > (("/bin/echo") echo))))) > > + (add-after 'post-install 'install-plugins > > + (lambda _ > > + (with-directory-excursion "plugin-factory" > > + (invoke "make" "install")))) > > + (add-before 'install 'dont-install-to-/var > > + (lambda _ > > + (substitute* "gozilla/Makefile" > > + (("DESTDIR\\)\\$\\{localstatedir\\}") "TMPDIR)")))) > > + (add-after 'install-plugins 'wrap-program > > + (lambda* (#:key inputs outputs #:allow-other-keys) > > + (wrap-program > > + (string-append (assoc-ref outputs "out") > > + "/share/gtags/script/pygments_parser.py") > > + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))) > > (add-after 'install 'post-install > > (lambda* (#:key outputs #:allow-other-keys) > > ;; Install the plugin files in the right place. >=20 > I have built it (but not tested it), but the rest this LGTM! Feel free > to push. >=20 > Thank you, >=20 > Maxim Thanks! Patch pushed. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --PvyDOQWNQAr9zFUn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmEuAEIACgkQQarn3Mo9 g1FWSg/+Od/mKTzfpgprMsH4/ufmgbk2ltwL63vqwRzSqlQ+zSnMP7jxIyKv/lKc taorE/c2765w8URW51zUAhlFl8wGJEdVdmv2BmCNYui9M+9h33hwMY94NehSMZ78 kutJmSLsDqDFyhk2nPthdB2POsEedKH+xpXlaUxfh6jsEXpQM0vUWW0M0zbKA76N R6BAa1uUPYBAt2NRIp+0pe8Ls6GJJvoRqsDHr1JkFOTPSiCkmkvWiA2tN6q+Zfl2 Nh4rHt3Nzv4PBfStf2RICDZ4MJ29ERW+rXo6rTYFOiI9WV1lI8CJNNutJ4gCsYDA TsQf4EI/jWI+4Sk8V634RBKHA5XJ9J303aEy3v5gBDD5irp2CHLu4wMVxB4NY5xy qBmP1ujMzHi2IUHueFzcHAui8EtndbTzNFDs6PN6y+Na2B9VWPu5Hl9McLZ0gXaT /S0A7XAE3GHWBBkByZ7t7mhWF+dgyHZ9G23ADNZYE1tvAshKf3l7nLo1P5V5SduG vSzS/MdPKtAj9XLNqDmLlORCpeB1qgEILNjntpEuXlMGofiGq8eb4aTXVr9vc0lu zbd0ts0V+UQ65t4iAYRm3IMn37jwOyfaEyexdbYxaJmFG40qtApp5Jvyg+G/I4Vh kU9FXLQH8wY3kKa9olAlb5HUPjeKzKktf5iOQvZv3jHniQ/XS0Y= =k+U8 -----END PGP SIGNATURE----- --PvyDOQWNQAr9zFUn--