From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: [PATCH] gnu: Add sedsed. Date: Fri, 10 Feb 2017 22:00:12 -0500 Message-ID: <87efz5sa83.fsf@openmailbox.org> References: <87a8a7qdz2.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> <20170131183953.9687-1-contact.ng0@cryptolab.net> <20170131183953.9687-2-contact.ng0@cryptolab.net> <87fujnp4io.fsf@openmailbox.org> <20170210213526.e23vo52dwhhyr4kx@wasp> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ccNvK-0007GG-7R for guix-devel@gnu.org; Fri, 10 Feb 2017 22:00:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ccNvH-00070a-3U for guix-devel@gnu.org; Fri, 10 Feb 2017 22:00:30 -0500 Received: from lb1.openmailbox.org ([5.79.108.160]:52723 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ccNvG-000702-MQ for guix-devel@gnu.org; Fri, 10 Feb 2017 22:00:27 -0500 In-Reply-To: <20170210213526.e23vo52dwhhyr4kx@wasp> (ng0's message of "Fri, 10 Feb 2017 21:35:26 +0000") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ng0 writes: > On 17-02-09 14:07:11, Kei Kebreau wrote: >> contact.ng0@cryptolab.net writes: >>=20 >> > From: ng0 >> > >> > * gnu/packages/admin.scm (sedsed): New variable. >> > --- >> > gnu/packages/admin.scm | 65 +++++++++++++++++++++++++++++++++++++++++= ++++++++- >> > 1 file changed, 64 insertions(+), 1 deletion(-) >> > >> > diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm >> > index 96aececbb..e865b36db 100644 >> > --- a/gnu/packages/admin.scm >> > +++ b/gnu/packages/admin.scm >> > @@ -12,7 +12,7 @@ >> > ;;; Copyright =C2=A9 2016, 2017 Efraim Flashner >> > ;;; Copyright =C2=A9 2016 Peter Feigl >> > ;;; Copyright =C2=A9 2016 John J. Foerch >> > -;;; Coypright =C2=A9 2016 ng0 >> > +;;; Coypright =C2=A9 2016, 2017 ng0 >> > ;;; Coypright =C2=A9 2016 Tobias Geerinckx-Rice >> > ;;; Coypright =C2=A9 2016 John Darrington >> > ;;; >> > @@ -1926,3 +1926,66 @@ in order to be able to find it. >> > @item @command{sunxi-nand-image-builder}: Prepares raw NAND images. >> > @end enumerate") >> > (license license:gpl2+))) >> > + >> > +(define-public sedsed >> > + (package >> > + (name "sedsed") >> > + (version "1.0") >> > + (source >> > + (origin >> > + (method url-fetch) >> > + (uri (string-append "https://github.com/aureliojargas/sedsed/" >> > + "archive/v" version ".tar.gz")) >> > + (file-name (string-append name "-" version ".tar.gz")) >> > + (sha256 >> > + (base32 >> > + "0139jkqvm8ipiwfj7k69ry2f9b1ffgpk79arpz4r7w9kf6h23bnh")))) >> > + (build-system python-build-system) >> > + (arguments >> > + `(#:tests? #f ; No tests. >> > + #:python ,python-2 >> > + #:phases >> > + (modify-phases %standard-phases >> > + (add-after 'unpack 'patch-sed-in >> > + (lambda _ >> > + (substitute* "sedsed.py" >> > + (("sedbin =3D 'sed'") >> > + (string-append "sedbin =3D '" (which "sed") "'"))) >> > + #t)) >> > + (delete 'build) >> > + (replace 'install >> > + (lambda* (#:key outputs #:allow-other-keys) >> > + (let* ((out (assoc-ref outputs "out")) >> > + (bin (string-append out "/bin"))) >> > + ;; Just one file to copy around >> > + (install-file "sedsed.py" bin) >> > + #t))) >> > + (add-after 'install 'symlink >> > + ;; Create 'sedsed' symlink to "sedsed.py". >> > + (lambda* (#:key outputs #:allow-other-keys) >> > + (let* ((out (assoc-ref outputs "out")) >> > + (bin (string-append out "/bin")) >> > + (sed (string-append bin "/sedsed")) >> > + (sedpy (string-append bin "/sedsed.py"))) >> > + (symlink sedpy sed) >> > + #t)))))) >> > + (home-page "http://aurelio.net/projects/sedsed") >> > + (synopsis "Sed sed scripts") >> > + (description >> > + "@code{sedsed} can debug, indent, tokenize and HTMLize your sed(= 1) scripts. >> > + >> > +In debug mode it reads your script and add extra commands to it. When >> > +executed you can see the data flow between the commands, revealing al= l the >> > +magic sed does on its internal buffers. >> > + >> > +In indent mode your script is reformatted with standard spacing. >> > + >> > +In tokenize mode you can see the elements of every command you use. >> > + >> > +In HTMLize mode your script is converted to a beautiful colored HTML = file, >> > +with all the commands and parameters identified for your viewing plea= sure. >> > + >> > +With sedsed you can master any sed script. No more secrets, no more = hidden >> > +buffers.") >> > + ;; Unspecified version of GPL. >> > + (license license:gpl3))) >>=20 >> There's only one blocking issue for this package. >>=20 >> The license specified on aurelio.net would be GPL3+ by our packaging >> conventions. The only problem is that the LICENSE file from Github shows >> an Expat license. I'm not sure which license takes precedence in this >> situtation. > > Ha. Thanks, I only relied on the source at aurelio.net at first. I think > when we take it from github, the included license (Expat) applies if no > other license is specificied in a file. > > Is this enough that you can make the change, or should I sent an updated > patch? I've made the change and pushed it to master. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAliefjwACgkQ5qXuPBlG eg3jpBAAu95ebTsi+qUOdkM/yIAHBJTbrRhcRtjpdRxgxSIAkf/3/LP+HbfRQyhj /n5hW3UclOFsPPrOmCVUA4PZa0zBYakP6oJb0yQnEodouNMcbBay0M3wb4PAhczS jqcOGhXU9sGDbPPLYEtczHoMSDokajI2O5RhMKKB0CbG77X58BO+c+rEMdrGt3pZ 7NQZ+UGXFUXhz80traAWzR2Hq9wiqgNrQMZ9qx+V27VvVzKbcG9GJzlZL45kjRoS XRgCZRhyiNbngsf0IAmfF88v+hzwhUPFbx/acXoxFI4o8i48Tk2LrvPp4lrYHlR9 UdFlbWYxXiaIr3uuxdvxnkNeGJmbbciaBac385hgxlLQMqz5SZzBkchFaidKgs11 qySegUy8Hk/IFihy7ZPHWJhy1wOJZSkOd7GeG8DkZr2QVuR95VDOc4IpAvXVAaZJ k42Q78WXFRqVVdqbMws6wdCNGLaltTLrNmJntEhtnzfv1Xsw42k5qUdtyADWmkVh Z4m1DRVtvkWU9yDN0xW5+BhVLFbDjqovXQFM7tDcxUAOUZmjQKe7/4RroPU8eWZZ 5t8U24ct3MKGGE/th/3IeRFZRezfpOTAK354swEu8FToDxs7+4OTbbTnappc8qze MmpMCw8Rw9CVGclEvmhBDznhF/i47P/2zfMy/cQVHSqpW1iEzZs= =H5wm -----END PGP SIGNATURE----- --=-=-=--