01/04: gnu: yajl: Drop custom ‘lib-’ prefix.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 8fe6d3e8446944294856950ef192cac83e03e58b
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Dec 4 01:00:52 2022 +0100

    gnu: yajl: Drop custom ‘lib-’ prefix.
    
    * 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/containers.scm     | 2 +-
 gnu/packages/monitoring.scm     | 2 +-
 gnu/packages/mpd.scm            | 2 +-
 gnu/packages/python-xyz.scm     | 4 ++--
 gnu/packages/virtualization.scm | 6 +++---
 gnu/packages/web.scm            | 7 +++++--
 gnu/packages/wm.scm             | 4 ++--
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 59eea423a1..e2d698dcc2 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -91,7 +91,7 @@
       (inputs
        (list libcap
              libseccomp
-             libyajl))
+             yajl))
       (native-inputs
        (list automake
              autoconf
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 37b9335ac8..74ec7b6cdf 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -636,7 +636,7 @@ devices.")
                       ;; Required because of patched sources.
                       (invoke "autoreconf" "-vfi"))))))
     (inputs
-     (list rrdtool curl libyajl))
+     (list rrdtool curl yajl))
     (native-inputs
      (list autoconf automake libtool pkg-config))
     (home-page "https://collectd.org/";)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index e0bd7633bc..5439d89f4a 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -170,7 +170,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
                   zlib))
     (native-inputs (list cmake pkg-config python-sphinx))
     ;; Missing optional inputs:
-    ;;   libyajl
+    ;;   yajl
     ;;   libcdio_paranoia
     ;;   libmms
     ;;   libadplug
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8591423116..9629012a80 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -29784,9 +29784,9 @@ simple mock/record and a complete capture/replay 
framework.")
              (when tests?
                (invoke "pytest" "-vv")))))))
     (inputs
-     ;; libyajl is optional, but compiling with it makes faster
+     ;; yajl is optional, but compiling with it makes faster
      ;; backends available to ijson:
-     (list libyajl))
+     (list yajl))
     (native-inputs
      (list python-pytest))
     (build-system python-build-system)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index c0334f1760..1218112a20 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1363,7 +1363,7 @@ pretty simple, REST API.")
            openssl
            readline
            cyrus-sasl
-           libyajl
+           yajl
            audit
            dmidecode
            dnsmasq
@@ -1403,7 +1403,7 @@ to integrate other virtualization mechanisms if needed.")
     (build-system meson-build-system)
     (inputs
      (list openssl cyrus-sasl lvm2 ; for libdevmapper
-           libyajl))
+           yajl))
     (native-inputs
      (list pkg-config intltool
            `(,glib "bin") vala))
@@ -2269,7 +2269,7 @@ override CC = " (assoc-ref inputs "cross-gcc") 
"/bin/i686-linux-gnu-gcc"))
        ("iproute" ,iproute) ; TODO: patch invocations.
        ("libaio" ,libaio)
        ("libx11" ,libx11)
-       ("libyajl" ,libyajl)
+       ("yajl" ,yajl)
        ("ncurses" ,ncurses)
        ("openssl" ,openssl)
        ("ovmf" ,ovmf)
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 @@ current version of any major web browser.")
 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 @@ style API.")
 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")
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index d3a7716c23..18fe606c7b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -287,7 +287,7 @@ or musca).
      (list alsa-lib
            libconfuse
            libnl
-           libyajl
+           yajl
            pulseaudio))
     (native-inputs
      (list asciidoc
@@ -342,7 +342,7 @@ commands would.")
            xcb-util-xrm
            libxkbcommon
            libev
-           libyajl
+           yajl
            xmlto
            perl-pod-simple
            libx11