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.
This commit is contained in:
		
							parent
							
								
									b5f3a1b84e
								
							
						
					
					
						commit
						8fe6d3e844
					
				
					 7 changed files with 15 additions and 12 deletions
				
			
		| 
						 | 
					@ -91,7 +91,7 @@
 | 
				
			||||||
      (inputs
 | 
					      (inputs
 | 
				
			||||||
       (list libcap
 | 
					       (list libcap
 | 
				
			||||||
             libseccomp
 | 
					             libseccomp
 | 
				
			||||||
             libyajl))
 | 
					             yajl))
 | 
				
			||||||
      (native-inputs
 | 
					      (native-inputs
 | 
				
			||||||
       (list automake
 | 
					       (list automake
 | 
				
			||||||
             autoconf
 | 
					             autoconf
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -636,7 +636,7 @@ devices.")
 | 
				
			||||||
                      ;; Required because of patched sources.
 | 
					                      ;; Required because of patched sources.
 | 
				
			||||||
                      (invoke "autoreconf" "-vfi"))))))
 | 
					                      (invoke "autoreconf" "-vfi"))))))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     (list rrdtool curl libyajl))
 | 
					     (list rrdtool curl yajl))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     (list autoconf automake libtool pkg-config))
 | 
					     (list autoconf automake libtool pkg-config))
 | 
				
			||||||
    (home-page "https://collectd.org/")
 | 
					    (home-page "https://collectd.org/")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -170,7 +170,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
 | 
				
			||||||
                  zlib))
 | 
					                  zlib))
 | 
				
			||||||
    (native-inputs (list cmake pkg-config python-sphinx))
 | 
					    (native-inputs (list cmake pkg-config python-sphinx))
 | 
				
			||||||
    ;; Missing optional inputs:
 | 
					    ;; Missing optional inputs:
 | 
				
			||||||
    ;;   libyajl
 | 
					    ;;   yajl
 | 
				
			||||||
    ;;   libcdio_paranoia
 | 
					    ;;   libcdio_paranoia
 | 
				
			||||||
    ;;   libmms
 | 
					    ;;   libmms
 | 
				
			||||||
    ;;   libadplug
 | 
					    ;;   libadplug
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29784,9 +29784,9 @@ simple mock/record and a complete capture/replay framework.")
 | 
				
			||||||
             (when tests?
 | 
					             (when tests?
 | 
				
			||||||
               (invoke "pytest" "-vv")))))))
 | 
					               (invoke "pytest" "-vv")))))))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     ;; libyajl is optional, but compiling with it makes faster
 | 
					     ;; yajl is optional, but compiling with it makes faster
 | 
				
			||||||
     ;; backends available to ijson:
 | 
					     ;; backends available to ijson:
 | 
				
			||||||
     (list libyajl))
 | 
					     (list yajl))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     (list python-pytest))
 | 
					     (list python-pytest))
 | 
				
			||||||
    (build-system python-build-system)
 | 
					    (build-system python-build-system)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1363,7 +1363,7 @@ pretty simple, REST API.")
 | 
				
			||||||
           openssl
 | 
					           openssl
 | 
				
			||||||
           readline
 | 
					           readline
 | 
				
			||||||
           cyrus-sasl
 | 
					           cyrus-sasl
 | 
				
			||||||
           libyajl
 | 
					           yajl
 | 
				
			||||||
           audit
 | 
					           audit
 | 
				
			||||||
           dmidecode
 | 
					           dmidecode
 | 
				
			||||||
           dnsmasq
 | 
					           dnsmasq
 | 
				
			||||||
| 
						 | 
					@ -1403,7 +1403,7 @@ to integrate other virtualization mechanisms if needed.")
 | 
				
			||||||
    (build-system meson-build-system)
 | 
					    (build-system meson-build-system)
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     (list openssl cyrus-sasl lvm2 ; for libdevmapper
 | 
					     (list openssl cyrus-sasl lvm2 ; for libdevmapper
 | 
				
			||||||
           libyajl))
 | 
					           yajl))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     (list pkg-config intltool
 | 
					     (list pkg-config intltool
 | 
				
			||||||
           `(,glib "bin") vala))
 | 
					           `(,glib "bin") vala))
 | 
				
			||||||
| 
						 | 
					@ -2269,7 +2269,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc"))
 | 
				
			||||||
       ("iproute" ,iproute) ; TODO: patch invocations.
 | 
					       ("iproute" ,iproute) ; TODO: patch invocations.
 | 
				
			||||||
       ("libaio" ,libaio)
 | 
					       ("libaio" ,libaio)
 | 
				
			||||||
       ("libx11" ,libx11)
 | 
					       ("libx11" ,libx11)
 | 
				
			||||||
       ("libyajl" ,libyajl)
 | 
					       ("yajl" ,yajl)
 | 
				
			||||||
       ("ncurses" ,ncurses)
 | 
					       ("ncurses" ,ncurses)
 | 
				
			||||||
       ("openssl" ,openssl)
 | 
					       ("openssl" ,openssl)
 | 
				
			||||||
       ("ovmf" ,ovmf)
 | 
					       ("ovmf" ,ovmf)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1395,9 +1395,9 @@ current version of any major web browser.")
 | 
				
			||||||
style API.")
 | 
					style API.")
 | 
				
			||||||
    (license license:expat)))
 | 
					    (license license:expat)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public libyajl
 | 
					(define-public yajl
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "libyajl")
 | 
					    (name "yajl")
 | 
				
			||||||
    (version "2.1.0")
 | 
					    (version "2.1.0")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method git-fetch)
 | 
					              (method git-fetch)
 | 
				
			||||||
| 
						 | 
					@ -1424,6 +1424,9 @@ style API.")
 | 
				
			||||||
parser written in ANSI C and a small validating JSON generator.")
 | 
					parser written in ANSI C and a small validating JSON generator.")
 | 
				
			||||||
    (license license:isc)))
 | 
					    (license license:isc)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public libyajl
 | 
				
			||||||
 | 
					  (deprecated-package "libyajl" yajl))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public libwebsockets
 | 
					(define-public libwebsockets
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "libwebsockets")
 | 
					    (name "libwebsockets")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -287,7 +287,7 @@ or musca).
 | 
				
			||||||
     (list alsa-lib
 | 
					     (list alsa-lib
 | 
				
			||||||
           libconfuse
 | 
					           libconfuse
 | 
				
			||||||
           libnl
 | 
					           libnl
 | 
				
			||||||
           libyajl
 | 
					           yajl
 | 
				
			||||||
           pulseaudio))
 | 
					           pulseaudio))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     (list asciidoc
 | 
					     (list asciidoc
 | 
				
			||||||
| 
						 | 
					@ -342,7 +342,7 @@ commands would.")
 | 
				
			||||||
           xcb-util-xrm
 | 
					           xcb-util-xrm
 | 
				
			||||||
           libxkbcommon
 | 
					           libxkbcommon
 | 
				
			||||||
           libev
 | 
					           libev
 | 
				
			||||||
           libyajl
 | 
					           yajl
 | 
				
			||||||
           xmlto
 | 
					           xmlto
 | 
				
			||||||
           perl-pod-simple
 | 
					           perl-pod-simple
 | 
				
			||||||
           libx11
 | 
					           libx11
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue