From 8fe6d3e8446944294856950ef192cac83e03e58b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 4 Dec 2022 01:00:52 +0100
Subject: gnu: yajl: Drop custom ‘lib-’ prefix.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/web.scm (yajl): New variable, renamed from…
(libyajl): …this one, which is now a DEPRECATED-PACKAGE alias of yajl.
Adjust all users.
---
 gnu/packages/web.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/web.scm')

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index c1e9e943c0..efb0313f05 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1395,9 +1395,9 @@ (define-public rapidjson
 style API.")
     (license license:expat)))
 
-(define-public libyajl
+(define-public yajl
   (package
-    (name "libyajl")
+    (name "yajl")
     (version "2.1.0")
     (source (origin
               (method git-fetch)
@@ -1424,6 +1424,9 @@ (define-public libyajl
 parser written in ANSI C and a small validating JSON generator.")
     (license license:isc)))
 
+(define-public libyajl
+  (deprecated-package "libyajl" yajl))
+
 (define-public libwebsockets
   (package
     (name "libwebsockets")
-- 
cgit v1.2.3


From 2a779dc9bdb10fbac4d2a43837e35e6558d1a6e9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 4 Dec 2022 01:00:04 +0100
Subject: gnu: yajl: Remove trailing #t from phases.

* gnu/packages/web.scm (yajl)[arguments]: Don't explicitly return #t from phases.
---
 gnu/packages/web.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'gnu/packages/web.scm')

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index efb0313f05..f6e07f4247 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1415,8 +1415,7 @@ (define-public yajl
          (add-after 'patch-source-shebangs 'patch-tests
            (lambda _
              (substitute* "test/parsing/run_tests.sh"
-               (("`which echo`") (which "echo")))
-             #t)))))
+               (("`which echo`") (which "echo"))))))))
     (home-page "https://lloyd.github.io/yajl/")
     (synopsis "C library for parsing JSON")
     (description
-- 
cgit v1.2.3


From 776632c0be107efcb0fb83d3d4ac4a7282acea97 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 4 Dec 2022 01:00:02 +0100
Subject: gnu: yajl: Improve description.

* gnu/packages/web.scm (yajl)[synopsis, description]: Edit.  Mark up.
Note generator.
---
 gnu/packages/web.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/web.scm')

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f6e07f4247..d59a5c0a3c 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1417,10 +1417,10 @@ (define-public yajl
              (substitute* "test/parsing/run_tests.sh"
                (("`which echo`") (which "echo"))))))))
     (home-page "https://lloyd.github.io/yajl/")
-    (synopsis "C library for parsing JSON")
+    (synopsis "C library for parsing and generating JSON")
     (description
-     "Yet Another JSON Library (YAJL) is a small event-driven (SAX-style) JSON
-parser written in ANSI C and a small validating JSON generator.")
+     "@acronym{YAJL, Yet Another JSON Library} is a small event-driven
+(SAX-style) JSON parser and validating generator written in ANSI C.")
     (license license:isc)))
 
 (define-public libyajl
-- 
cgit v1.2.3


From 2fb187ed7c2ae9b4c46ba128c105685e3adda2df Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Tue, 13 Dec 2022 13:11:40 +0000
Subject: gnu: guix-data-service: Update to 0.0.1-36.7b69611.

* gnu/packages/web.scm (guix-data-service): Update to 0.0.1-36.7b69611.
---
 gnu/packages/web.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/web.scm')

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d59a5c0a3c..dcb7b3872a 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4659,8 +4659,8 @@ (define-public python-feedparser
                    license:freebsd-doc)))) ; documentation
 
 (define-public guix-data-service
-  (let ((commit "95064d39a337da9f2eb7d5675e0e511301466f77")
-        (revision "34"))
+  (let ((commit "7b69611755ac3b9132710d83a1139b4c5606578d")
+        (revision "36"))
     (package
       (name "guix-data-service")
       (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@@ -4672,7 +4672,7 @@ (define-public guix-data-service
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1nkasn2wk36jfnfan619lv604cjj6ppwvmiljckcyyr57yynqbr4"))))
+                  "0lmvmalgfbc6q80f8dwqikdd5kna2vl4jlmf2li206hmcq2hzh6p"))))
       (build-system gnu-build-system)
       (arguments
        '(#:modules ((guix build utils)
-- 
cgit v1.2.3