From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] gnu: Add re2. Date: Wed, 17 Aug 2016 16:18:48 +0100 Message-ID: <87bn0rzanb.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> References: <87eg5qgp2r.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> <20160816175910.GB1260@jasmine> <87r39nzntl.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ba2cU-0003wD-7J for guix-devel@gnu.org; Wed, 17 Aug 2016 11:19:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ba2cO-0008Fl-Pa for guix-devel@gnu.org; Wed, 17 Aug 2016 11:19:05 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ba2cM-0008Aj-F2 for guix-devel@gnu.org; Wed, 17 Aug 2016 11:19:00 -0400 In-Reply-To: <87r39nzntl.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> 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: Leo Famulari Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Marius Bakke writes: > Leo Famulari writes: > >> On Mon, Aug 15, 2016 at 02:05:16PM +0100, Marius Bakke wrote: >>> >>> I wasn't sure where to put this, so went with its own file. It does not >>> fully implement PCRE so pcre.scm seems inappropriate. Perhaps that could >>> be renamed to regex.scm or similar. >> >> The patch looks good, but please put it in regex.scm! But, I don't want >> to move all the regex packages into this new regex module. Perhaps tre, >> since it appears to have no users in our tree. > > Moved to regex.scm. Thanks! ..and here is a patch that moves tre.scm over as well. The code is unchanged apart from license: prefix. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-tre-Move-to-regex.scm.patch Content-Transfer-Encoding: quoted-printable >From 8e673ebd8c68c3a92fa60b56068339c011607752 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Aug 2016 16:10:15 +0100 Subject: [PATCH 2/2] gnu: tre: Move to regex.scm. * gnu/packages/tre.scm (tre): Move from here ... * gnu/packages/regex.scm (tre): ... to here. * gnu/packages/tre.scm: Delete file. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove tre.scm. --- gnu/local.mk | 1 - gnu/packages/regex.scm | 34 ++++++++++++++++++++++++++++++ gnu/packages/tre.scm | 57 ----------------------------------------------= ---- 3 files changed, 34 insertions(+), 58 deletions(-) delete mode 100644 gnu/packages/tre.scm diff --git a/gnu/local.mk b/gnu/local.mk index a18ed44..ebf2d13 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -342,7 +342,6 @@ GNU_SYSTEM_MODULES =3D \ %D%/packages/tls.scm \ %D%/packages/tmux.scm \ %D%/packages/tor.scm \ - %D%/packages/tre.scm \ %D%/packages/tv.scm \ %D%/packages/unrtf.scm \ %D%/packages/upnp.scm \ diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index cea9db8..b34b26d 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -1,4 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2014 John Darrington +;;; Copyright =C2=A9 2015 Mark H Weaver ;;; Copyright =C2=A9 2016 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -55,3 +57,35 @@ backtracking regular expression engines like those used in PCRE, Perl and Python. It is a C++ library.") (license license:bsd-3))) + +(define-public tre + (package + (name "tre") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri + (string-append "http://laurikari.net/tre/" name "-" version + ".tar.bz2")) + (sha256 + (base32 "0n36cgqys59r2gmb7jzbqiwsy790v8nbxk82d2n2saz0rp145ild"))= )) + + (build-system gnu-build-system) + (arguments + `(#:phases (alist-cons-before + 'check 'install-locales + (lambda _ + ;; The tests require the availability of the + ;; 'en_US.ISO-8859-1' locale. + (setenv "LOCPATH" (getcwd)) + (zero? (system* "localedef" "--no-archive" + "--prefix" (getcwd) "-i" "en_US" + "-f" "ISO-8859-1" "./en_US.ISO-8859-1"= ))) + %standard-phases))) + (synopsis "Approximate regex matching library and agrep utility") + (description "Superset of the POSIX regex API, enabling approximate +matching. Also ships a version of the agrep utility which behaves similar= to +grep but features inexact matching.") + (home-page "http://laurikari.net/tre") + (license license:bsd-2))) diff --git a/gnu/packages/tre.scm b/gnu/packages/tre.scm deleted file mode 100644 index 721a350..0000000 --- a/gnu/packages/tre.scm +++ /dev/null @@ -1,57 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2014 John Darrington -;;; Copyright =C2=A9 2015 Mark H Weaver -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages tre) - #:use-module (gnu packages) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (guix licenses)) - -(define-public tre - (package - (name "tre") - (version "0.8.0") - (source - (origin - (method url-fetch) - (uri - (string-append "http://laurikari.net/tre/" name "-" version - ".tar.bz2")) - (sha256 - (base32 "0n36cgqys59r2gmb7jzbqiwsy790v8nbxk82d2n2saz0rp145ild"))= )) - - (build-system gnu-build-system) - (arguments - `(#:phases (alist-cons-before - 'check 'install-locales - (lambda _ - ;; The tests require the availability of the - ;; 'en_US.ISO-8859-1' locale. - (setenv "LOCPATH" (getcwd)) - (zero? (system* "localedef" "--no-archive" - "--prefix" (getcwd) "-i" "en_US" - "-f" "ISO-8859-1" "./en_US.ISO-8859-1"= ))) - %standard-phases))) - (synopsis "Approximate regex matching library and agrep utility") - (description "Superset of the POSIX regex API, enabling approximate -matching. Also ships a version of the agrep utility which behaves similar= to -grep but features inexact matching.") - (home-page "http://laurikari.net/tre") - (license bsd-2))) --=20 2.9.2 --=-=-=--