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>
This commit is contained in:
Marius Bakke 2016-08-17 16:10:15 +01:00 committed by Alex Kost
parent f32ffa04ba
commit ac8a642886
No known key found for this signature in database
GPG key ID: 82460C082A0EE98F
3 changed files with 32 additions and 58 deletions

View file

@ -345,7 +345,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/tls.scm \ %D%/packages/tls.scm \
%D%/packages/tmux.scm \ %D%/packages/tmux.scm \
%D%/packages/tor.scm \ %D%/packages/tor.scm \
%D%/packages/tre.scm \
%D%/packages/tv.scm \ %D%/packages/tv.scm \
%D%/packages/unrtf.scm \ %D%/packages/unrtf.scm \
%D%/packages/upnp.scm \ %D%/packages/upnp.scm \

View file

@ -1,4 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -55,3 +57,33 @@ (define-public re2
backtracking regular expression engines like those used in PCRE, Perl and backtracking regular expression engines like those used in PCRE, Perl and
Python. It is a C++ library.") Python. It is a C++ library.")
(license license:bsd-3))) (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)))

View file

@ -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)))