aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2016-08-17 16:10:15 +0100
committerAlex Kost <alezost@gmail.com>2016-09-12 16:38:03 +0300
commitac8a6428867086b1091d8a1f4b21b1e321531256 (patch)
tree6589e4acc4774709b1baade0a29882af4a7da0d3
parentf32ffa04ba14a3dc6cc6e30e71bcfccf0ddf50e2 (diff)
downloadguix-ac8a6428867086b1091d8a1f4b21b1e321531256.tar
guix-ac8a6428867086b1091d8a1f4b21b1e321531256.tar.gz
gnu: tre: Move to (gnu packages regex).
* gnu/packages/tre.scm: Remove. Move 'tre' to... * gnu/packages/regex.scm (tre): ... here. New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. Signed-off-by: Alex Kost <alezost@gmail.com>
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/regex.scm32
-rw-r--r--gnu/packages/tre.scm57
3 files changed, 32 insertions, 58 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index c504b067fe..9b350131dd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -345,7 +345,6 @@ GNU_SYSTEM_MODULES = \
%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 cea9db8379..e685a17d28 100644
--- a/gnu/packages/regex.scm
+++ b/gnu/packages/regex.scm
@@ -1,4 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington
+;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -55,3 +57,33 @@
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 721a350cf0..0000000000
--- a/gnu/packages/tre.scm
+++ /dev/null
@@ -1,57 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 John Darrington
-;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;;
-;;; 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 <http://www.gnu.org/licenses/>.
-
-(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)))