Patchwork gnu: Add re2.

login
register
mail settings
Submitter Marius Bakke
Date Aug. 17, 2016, 10:34 a.m.
Message ID <87r39nzntl.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me>
Download mbox | patch
Permalink /patch/14681/
State New
Headers show

Comments

Marius Bakke - Aug. 17, 2016, 10:34 a.m.
Leo Famulari <leo@famulari.name> 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!
Leo Famulari - Aug. 18, 2016, 8:37 p.m.
On Wed, Aug 17, 2016 at 11:34:14AM +0100, Marius Bakke wrote:
> Leo Famulari <leo@famulari.name> 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!

Thanks, pushed as dc253bf0a5!

Patch

From 137d7ca124c66d23862949228b678a2db1a940b0 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 14 Aug 2016 20:16:01 +0100
Subject: [PATCH] gnu: Add re2.

* gnu/packages/regex.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk           |  1 +
 gnu/packages/regex.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 gnu/packages/regex.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 7416850..7f4e397 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -297,6 +297,7 @@  GNU_SYSTEM_MODULES =				\
   %D%/packages/rdesktop.scm			\
   %D%/packages/rdf.scm				\
   %D%/packages/readline.scm			\
+  %D%/packages/regex.scm				\
   %D%/packages/rrdtool.scm			\
   %D%/packages/rsync.scm			\
   %D%/packages/ruby.scm				\
diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm
new file mode 100644
index 0000000..cea9db8
--- /dev/null
+++ b/gnu/packages/regex.scm
@@ -0,0 +1,57 @@ 
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
+;;;
+;;; 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 regex)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public re2
+   (package
+     (name "re2")
+     (version "2016-08-01")
+     (source (origin
+               (method url-fetch)
+               (uri
+                (string-append
+                 "https://github.com/google/re2/archive/"
+                 version ".tar.gz"))
+               (file-name (string-append name "-" version ".tar.gz"))
+               (sha256
+                (base32
+                 "06pfm3xi5irrrij85m0c46rsn9jyg1rc2r431wi2knhjvbw9f0bx"))))
+     (build-system gnu-build-system)
+     (arguments
+      `(#:test-target "test"
+        ;; There is no configure step, but the Makefile respects a prefix.
+        #:make-flags (list (string-append "prefix=" %output))
+        #:phases
+        (modify-phases %standard-phases
+          (delete 'configure)
+          (add-after 'install 'delete-static-library
+            (lambda* (#:key outputs #:allow-other-keys)
+              ;; No make target for shared-only; delete the static version.
+              (delete-file (string-append (assoc-ref outputs "out")
+                                          "/lib/libre2.a")))))))
+     (home-page "https://github.com/google/re2")
+     (synopsis "Fast, safe, thread-friendly regular expression engine")
+     (description "RE2 is a fast, safe, thread-friendly alternative to
+backtracking regular expression engines like those used in PCRE, Perl and
+Python.  It is a C++ library.")
+     (license license:bsd-3)))
-- 
2.9.2