Merge remote-tracking branch 'origin/go-team'

Change-Id: Ie1a29192d144a59394bbacba3f6b9f110413e821

1 files changed, 16 insertions, 35 deletions

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 8028f1e977..b237143684 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5434,7 +5434,7 @@ you'd expect.")
 (define-public go-github-com-mikefarah-yq-v4
   (package
     (name "go-github-com-mikefarah-yq-v4")
-    (version "4.34.2")
+    (version "4.44.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5443,7 +5443,7 @@ you'd expect.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0y5i0p4fiq0kad9xqihhyclhd9d3l2r5yligdkvsdc90hlqjmql3"))))
+                "0s7c8r6y5jv6wda2v3k47hawfdr9j3rwk717l6byvh5qsbbml0vd"))))
     (build-system go-build-system)
     (arguments
      (list #:import-path "github.com/mikefarah/yq/v4"
@@ -5456,6 +5456,7 @@ you'd expect.")
     (propagated-inputs
      (list go-github-com-a8m-envsubst
            go-github-com-alecthomas-participle-v2
+           go-github-com-alecthomas-repr
            go-github-com-dimchansky-utfbom
            go-github-com-elliotchance-orderedmap
            go-github-com-fatih-color
@@ -5464,7 +5465,10 @@ you'd expect.")
            go-github-com-jinzhu-copier
            go-github-com-magiconair-properties
            go-github-com-pelletier-go-toml-v2
+           go-github-com-pkg-diff
            go-github-com-spf13-cobra
+           go-github-com-spf13-pflag
+           go-github-com-yuin-gopher-lua
            go-golang-org-x-net
            go-golang-org-x-text
            go-gopkg-in-op-go-logging-v1
@@ -5494,53 +5498,30 @@ JSON, XML, properties, CSV and TSV.")
     (propagated-inputs '())
     (inputs (package-propagated-inputs go-github-com-mikefarah-yq-v4))))
 
-(define-public go-github-com-itchyny-timefmt-go
+(define-public go-github-com-itchyny-gojq
   (package
-    (name "go-github-com-itchyny-timefmt-go")
-    (version "0.1.4")
+    (name "go-github-com-itchyny-gojq")
+    (version "0.12.16")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/itchyny/timefmt-go")
+             (url "https://github.com/itchyny/gojq")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0z5z8hy5lbjqdxp544mf238i77n7pf7bv3psgr5gffh0630dsyag"))))
+        (base32 "0favs281iaq98cmqwf47amk12xpksznpwgfid24z8migkp8628wl"))))
     (build-system go-build-system)
     (arguments
-     (list #:import-path "github.com/itchyny/timefmt-go"))
-    (home-page "https://github.com/itchyny/timefmt-go")
-    (synopsis "Efficient time formatting library (strftime, strptime) for Golang")
-    (description
-     "@code{timefmt-go} is a Go language package for formatting and parsing date
-time strings.")
-    (license license:expat)))
-
-(define-public go-github-com-itchyny-gojq
-  (package
-    (name "go-github-com-itchyny-gojq")
-    (version "0.12.11")
-    (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/itchyny/gojq")
-               (commit (string-append "v" version))))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1dqmnxnipi497nx9x10ifack09w41579svryss5q2w5wxy0pg764"))))
-    (build-system go-build-system)
+     (list
+      #:import-path "github.com/itchyny/gojq/cmd/gojq"
+      #:unpack-path "github.com/itchyny/gojq"))
     (inputs
      (list go-github-com-google-go-cmp
            go-github-com-itchyny-timefmt-go
            go-github-com-mattn-go-isatty
            go-github-com-mattn-go-runewidth
            go-gopkg-in-yaml-v3))
-    (arguments
-     (list
-      #:import-path "github.com/itchyny/gojq/cmd/gojq"
-      #:unpack-path "github.com/itchyny/gojq"))
     (home-page "https://github.com/itchyny/gojq")
     (synopsis "Pure Go implementation of jq")
     (description
@@ -9018,7 +8999,7 @@ in mind.  It has features such as:
 (define-public kiln
   (package
     (name "kiln")
-    (version "0.4.0")
+    (version "0.4.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -9027,7 +9008,7 @@ in mind.  It has features such as:
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1lvzv46hn80gffw47mcc28iahwqng7pvg500s9jlrq6mhr4k5ih4"))))
+                "1ynb079jsyv6viwdksavwar5lqj84ssfw39dl5da98z683xrvch5"))))
     (build-system go-build-system)
     (arguments
      (list