From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH] gnu: Add sedsed. Date: Fri, 10 Feb 2017 21:35:26 +0000 Message-ID: <20170210213526.e23vo52dwhhyr4kx@wasp> 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> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ccIpE-0002Z0-2F for guix-devel@gnu.org; Fri, 10 Feb 2017 16:33:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ccIpA-00087K-Il for guix-devel@gnu.org; Fri, 10 Feb 2017 16:33:52 -0500 Received: from fragranza.investici.org ([178.175.144.26]:59136) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ccIpA-00085a-8K for guix-devel@gnu.org; Fri, 10 Feb 2017 16:33:48 -0500 Content-Disposition: inline In-Reply-To: <87fujnp4io.fsf@openmailbox.org> 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: Kei Kebreau Cc: guix-devel@gnu.org 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. Wh= en > > +executed you can see the data flow between the commands, revealing a= ll 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 ple= asure. > > + > > +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 show= s > 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? --=20 ng0 -- https://www.inventati.org/patternsinthechaos/