Re: [PATCH 2/2] Add jq

[Jelle Licht <jlicht@fsfe.org>]

[-- Attachment #1.1: Type: text/plain, Size: 1433 bytes --]

2016-03-27 0:26 GMT+01:00 Leo Famulari <leo@famulari.name>:

> On Sat, Mar 26, 2016 at 11:53:24PM +0100, Jelle Licht wrote:
> > From jq's README:
> >
> > To get regexp support you'll also need to install Oniguruma (note that
> jq's
> > > tests require regexp support to pass).
> >
> >
> > So it seems to be an optional dependency (which allows tests to pass and
> > adds functionality). I could make it a build-time dependency, or not.
> > What is the 'guix' way of handling these cases?
>
> In this case I think the description should be changed.
>
> >
> > --
> > Jelle
> >
> >
> > 2016-03-26 23:45 GMT+01:00 Leo Famulari <leo@famulari.name>:
> >
> > > On Sat, Mar 26, 2016 at 11:06:15PM +0100, Jelle Licht wrote:
> > > > +    (inputs
> > > > +     `(("oniguruma" ,oniguruma)))
> > >
> > > [...]
> > >
> > > > +    (description "jq is like sed for JSON data – you can use it to
> > > slice and
> > > > +filter and map and transform structured data with the same ease that
> > > sed, awk,
> > > > +grep and friends let you play with text.  It is written in portable
> C,
> > > and it
> > > > +has zero runtime dependencies.  jq can mangle the data format that
> you
> > > have
> > >        ^-----------------------^
> > >
> > > Since oniguruma is listed as a run-time dependency, does this mean the
> > > description is wrong? Or is oniguruma only needed to build?
> > >
>

^ changed

[-- Attachment #1.2: Type: text/html, Size: 2174 bytes --]

[-- Attachment #2: 0002-gnu-Add-jq.patch --]
[-- Type: text/x-patch, Size: 2678 bytes --]

From 9bc43e4ee37a35ba8e724eac103c39c72d870f75 Mon Sep 17 00:00:00 2001
From: Jelle Licht <jlicht@fsfe.org>
Date: Sat, 26 Mar 2016 22:49:42 +0100
Subject: [PATCH 2/2] gnu: Add jq

* gnu/packages/web.scm: (jq): New variable
---
 gnu/packages/web.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 516e623..49fe19e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
+;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -52,10 +53,12 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages valgrind)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages statistics))
 
@@ -3109,3 +3112,33 @@ callback or connection interfaces.")
      "Gumbo is an implementation of the HTML5 parsing algorithm implemented as
 a pure C99 library.")
     (license l:asl2.0)))
+
+(define-public jq
+  (package
+    (name "jq")
+    (version "1.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/stedolan/" name
+                                  "/releases/download/" name "-" version
+                                  "/" name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"))))
+    (inputs
+     `(("oniguruma" ,oniguruma)))
+    (native-inputs
+     `(;; TODO fix gems to generate documentation
+       ;;("ruby" ,ruby)
+       ;;("bundler" ,bundler)
+       ("valgrind" ,valgrind)))
+    (build-system gnu-build-system)
+    (home-page "http://stedolan.github.io/jq/")
+    (synopsis "Command-line JSON processor")
+    (description "jq is like sed for JSON data – you can use it to slice and
+filter and map and transform structured data with the same ease that sed, awk,
+grep and friends let you play with text.  It is written in portable C.  jq and
+can mangle the data format that you have into the one that you want with very
+little effort, and the program to do so is often shorter and simpler than
+you’d expect.")
+    (license (list l:expat l:cc-by3.0))))
-- 
2.7.3