From 27bcf151d1bbf1eab0da82d441c5b39fc58d2c79 Mon Sep 17 00:00:00 2001
From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
Date: Sat, 27 Jun 2020 11:08:26 +0200
Subject: [PATCH 1/4] gnu: gdb-minimal: Include guile.

* gnu/packages/gdb.scm (gdb-minimal): Do not remove guile, as it is a cheap
and very useful dependency.
---
 gnu/packages/gdb.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 38e45b14e5..830121751f 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -164,5 +164,4 @@ (define-public gdb-minimal
    gdb-9.2
    (name "gdb-minimal")
    (inputs (fold alist-delete (package-inputs gdb)
-                 '("guile" "libxml2" "ncurses" "python-wrapper"
-                   "source-highlight")))))
+                 '("libxml2" "ncurses" "python-wrapper" "source-highlight")))))

From 27fffa19c0098f9f988e4739f8f936b1cbb9d3df Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sat, 27 Jun 2020 11:39:44 +0300
Subject: [PATCH 2/4] gnu: python-tabulate: Update to 0.8.7.

* gnu/packages/python-xyz.scm (python-tabulate): Update to 0.8.7.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index be27f2b60b..300277f045 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11691,13 +11691,13 @@ (define-public python-ply
 (define-public python-tabulate
   (package
     (name "python-tabulate")
-    (version "0.7.7")
+    (version "0.8.7")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "tabulate" version))
              (sha256
               (base32
-               "1inqhspd4frxnp08c32yndr0lc4px1xfkqah184i5w09gkhvi843"))))
+               "01shi7bmj09f0bcm5s0c9skys063lzp76p0n4a2xmg041ni269yv"))))
     (build-system python-build-system)
     (arguments
      ;; FIXME: The pypi release tarball is missing a 'test/common.py'

From ace3e549737e7bd935bebeb69b13087d8f0ccd6d Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sat, 27 Jun 2020 11:39:50 +0300
Subject: [PATCH 3/4] gnu: Add jtbl.

* gnu/packages/admin.scm (jtbl): New variable.
---
 gnu/packages/admin.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index de2f6534f8..9212401c40 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3863,3 +3863,25 @@ (define-public pam-mount
 supports.  It can also mount encrypted LUKS volumes using the password
 supplied by the user when logging in.")
     (license (list license:gpl2+ license:lgpl2.1+))))
+
+(define-public jtbl
+  (package
+    (name "jtbl")
+    (version "1.1.6")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/kellyjonbrazil/jtbl.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1zzd7rd63xva50f22d1rfja4r302aizrafarhwm67vv181swvdya"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-tabulate" ,python-tabulate)))
+    (home-page "https://github.com/kellyjonbrazil/jtbl")
+    (synopsis "Command-line tool to print JSON data as a table in the terminal")
+    (description "@code{jtbl} accepts piped JSON data from stdin and outputs a
+text table representation to stdout.")
+    (license license:expat)))

From d8a046d560e8e149e903b7d3648c7218bf17c085 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sat, 27 Jun 2020 12:46:55 +0300
Subject: [PATCH 4/4] gnu: Add jc.

* gnu/packages/admin.scm (jc): New variable.
---
 gnu/packages/admin.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 9212401c40..9d9fd2d95d 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -124,6 +124,7 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages ruby)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages terminals)
@@ -3864,6 +3865,30 @@ (define-public pam-mount
 supplied by the user when logging in.")
     (license (list license:gpl2+ license:lgpl2.1+))))
 
+(define-public jc
+  (package
+    (name "jc")
+    (version "1.11.8")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/kellyjonbrazil/jc.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0rkckbgm04ql4r48wjgljfiqvsz36n99yqcpcyna8lvlm8h4nmwa"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-ruamel.yaml" ,python-ruamel.yaml)
+       ("python-xmltodict" ,python-xmltodict)
+       ("python-pygments" ,python-pygments)))
+    (home-page "https://github.com/kellyjonbrazil/jc")
+    (synopsis "Convert the output of command-line tools to JSON")
+    (description "@code{jc} JSONifies the output of many CLI tools and
+file-types for easier parsing in scripts.")
+    (license license:expat)))
+
 (define-public jtbl
   (package
     (name "jtbl")