gnu: json-c: Update to 0.14.
* gnu/packages/web.scm (json-c): Update to 0.14. [source](modules, snippet): Remove. [build-system]: Change to CMAKE-BUILD-SYSTEM. (json-c-0.13): New public variable. (json-c-0.12): Inherit from JSON-C-0.13. * gnu/packages/cryptsetup.scm (cryptsetup-static)[inputs]: Stick with JSON-C-0.13. * gnu/packages/linux.scm (multipath-tools)[inputs]: Likewise. * gnu/packages/security-token.scm (yubikey-personalization, libu2f-host, libu2f-server)[inputs]: Likewise. * gnu/packages/syndication.scm (newsboat)[inputs]: Likewise.
This commit is contained in:
		
							parent
							
								
									f2ff01bb8e
								
							
						
					
					
						commit
						beec29da92
					
				
					 5 changed files with 34 additions and 21 deletions
				
			
		| 
						 | 
					@ -58,7 +58,7 @@
 | 
				
			||||||
    `(("pkg-config" ,pkg-config)))
 | 
					    `(("pkg-config" ,pkg-config)))
 | 
				
			||||||
   (inputs
 | 
					   (inputs
 | 
				
			||||||
    `(("argon2" ,argon2)
 | 
					    `(("argon2" ,argon2)
 | 
				
			||||||
      ("json-c" ,json-c)
 | 
					      ("json-c" ,json-c-0.13)   ;XXX update this for cryptsetup >= 2.3
 | 
				
			||||||
      ("libgcrypt" ,libgcrypt)
 | 
					      ("libgcrypt" ,libgcrypt)
 | 
				
			||||||
      ("lvm2" ,lvm2)                    ; device-mapper
 | 
					      ("lvm2" ,lvm2)                    ; device-mapper
 | 
				
			||||||
      ("popt" ,popt)
 | 
					      ("popt" ,popt)
 | 
				
			||||||
| 
						 | 
					@ -138,7 +138,7 @@ files).  This assumes LIBRARY uses Libtool."
 | 
				
			||||||
              (inherit (static-library libgcrypt))
 | 
					              (inherit (static-library libgcrypt))
 | 
				
			||||||
              (propagated-inputs
 | 
					              (propagated-inputs
 | 
				
			||||||
               `(("libgpg-error-host" ,(static-library libgpg-error)))))))
 | 
					               `(("libgpg-error-host" ,(static-library libgpg-error)))))))
 | 
				
			||||||
       `(("json-c" ,json-c)
 | 
					       `(("json-c" ,json-c-0.13)
 | 
				
			||||||
         ("libgcrypt" ,libgcrypt-static)
 | 
					         ("libgcrypt" ,libgcrypt-static)
 | 
				
			||||||
         ("lvm2" ,lvm2-static)
 | 
					         ("lvm2" ,lvm2-static)
 | 
				
			||||||
         ("util-linux" ,util-linux "static")
 | 
					         ("util-linux" ,util-linux "static")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4243,7 +4243,7 @@ arrays when needed.")
 | 
				
			||||||
       ("pkg-config" ,pkg-config)
 | 
					       ("pkg-config" ,pkg-config)
 | 
				
			||||||
       ("valgrind" ,valgrind)))
 | 
					       ("valgrind" ,valgrind)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("json-c" ,json-c)
 | 
					     `(("json-c" ,json-c-0.13)
 | 
				
			||||||
       ("libaio" ,libaio)
 | 
					       ("libaio" ,libaio)
 | 
				
			||||||
       ("liburcu" ,liburcu)
 | 
					       ("liburcu" ,liburcu)
 | 
				
			||||||
       ("lvm2" ,lvm2)
 | 
					       ("lvm2" ,lvm2)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -357,7 +357,7 @@ and other operations.  It includes a library and a command-line tool.")
 | 
				
			||||||
                                              (assoc-ref %outputs "out")
 | 
					                                              (assoc-ref %outputs "out")
 | 
				
			||||||
                                              "/lib/udev/rules.d"))))
 | 
					                                              "/lib/udev/rules.d"))))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("json-c" ,json-c)
 | 
					     `(("json-c" ,json-c-0.13)
 | 
				
			||||||
       ("libusb" ,libusb)
 | 
					       ("libusb" ,libusb)
 | 
				
			||||||
       ;; The library "libyubikey" is also known as "yubico-c".
 | 
					       ;; The library "libyubikey" is also known as "yubico-c".
 | 
				
			||||||
       ("libyubikey" ,libyubikey)))
 | 
					       ("libyubikey" ,libyubikey)))
 | 
				
			||||||
| 
						 | 
					@ -457,7 +457,7 @@ PCSC API Python wrapper module.")
 | 
				
			||||||
                               "/xml/dtd/docbook/docbookx.dtd")))
 | 
					                               "/xml/dtd/docbook/docbookx.dtd")))
 | 
				
			||||||
             #t)))))
 | 
					             #t)))))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("json-c" ,json-c)
 | 
					     `(("json-c" ,json-c-0.13)
 | 
				
			||||||
       ("hidapi" ,hidapi)))
 | 
					       ("hidapi" ,hidapi)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("help2man" ,help2man)
 | 
					     `(("help2man" ,help2man)
 | 
				
			||||||
| 
						 | 
					@ -497,7 +497,7 @@ operations.")
 | 
				
			||||||
       (list "--enable-gtk-doc"
 | 
					       (list "--enable-gtk-doc"
 | 
				
			||||||
             "--enable-tests")))
 | 
					             "--enable-tests")))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("json-c" ,json-c)
 | 
					     `(("json-c" ,json-c-0.13)
 | 
				
			||||||
       ("libressl" ,libressl)))
 | 
					       ("libressl" ,libressl)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("autoconf" ,autoconf)
 | 
					     `(("autoconf" ,autoconf)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -57,7 +57,7 @@
 | 
				
			||||||
       ("asciidoc" ,asciidoc)))
 | 
					       ("asciidoc" ,asciidoc)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("curl" ,curl)
 | 
					     `(("curl" ,curl)
 | 
				
			||||||
       ("json-c" ,json-c)
 | 
					       ("json-c" ,json-c-0.13)
 | 
				
			||||||
       ("libxml2" ,libxml2)
 | 
					       ("libxml2" ,libxml2)
 | 
				
			||||||
       ("ncurses" ,ncurses)
 | 
					       ("ncurses" ,ncurses)
 | 
				
			||||||
       ("stfl" ,stfl)
 | 
					       ("stfl" ,stfl)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -768,7 +768,7 @@ data.")
 | 
				
			||||||
(define-public json-c
 | 
					(define-public json-c
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "json-c")
 | 
					    (name "json-c")
 | 
				
			||||||
    (version "0.13.1")
 | 
					    (version "0.14")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
             (method url-fetch)
 | 
					             (method url-fetch)
 | 
				
			||||||
             (uri (string-append
 | 
					             (uri (string-append
 | 
				
			||||||
| 
						 | 
					@ -776,17 +776,8 @@ data.")
 | 
				
			||||||
                   version ".tar.gz"))
 | 
					                   version ".tar.gz"))
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq"))
 | 
					               "0w381krr99q5a2rypx4g437fa7gzgl82i64sgnrs6g5jr44dwxxk"))))
 | 
				
			||||||
             (modules '((guix build utils)))
 | 
					    (build-system cmake-build-system)
 | 
				
			||||||
             (snippet
 | 
					 | 
				
			||||||
              '(begin
 | 
					 | 
				
			||||||
                 ;; Somehow 'config.h.in' is older than
 | 
					 | 
				
			||||||
                 ;; 'aclocal.m4', which would trigger a rule to
 | 
					 | 
				
			||||||
                 ;; run 'autoheader'.
 | 
					 | 
				
			||||||
                 (set-file-time "config.h.in"
 | 
					 | 
				
			||||||
                                (stat "aclocal.m4"))
 | 
					 | 
				
			||||||
                 #t))))
 | 
					 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					 | 
				
			||||||
    (home-page "https://github.com/json-c/json-c/wiki")
 | 
					    (home-page "https://github.com/json-c/json-c/wiki")
 | 
				
			||||||
    (synopsis "JSON implementation in C")
 | 
					    (synopsis "JSON implementation in C")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
| 
						 | 
					@ -796,10 +787,32 @@ parse JSON-formatted strings back into the C representation of JSON objects.
 | 
				
			||||||
It aims to conform to RFC 7159.")
 | 
					It aims to conform to RFC 7159.")
 | 
				
			||||||
    (license license:x11)))
 | 
					    (license license:x11)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;; TODO: remove this old version when all dependents have been updated.
 | 
					;; TODO: Remove these old versions when all dependents have been updated.
 | 
				
			||||||
(define-public json-c-0.12
 | 
					(define-public json-c-0.13
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (inherit json-c)
 | 
					    (inherit json-c)
 | 
				
			||||||
 | 
					    (version "0.13.1")
 | 
				
			||||||
 | 
					    (source (origin
 | 
				
			||||||
 | 
					             (method url-fetch)
 | 
				
			||||||
 | 
					             (uri (string-append
 | 
				
			||||||
 | 
					                   "https://s3.amazonaws.com/json-c_releases/releases/json-c-"
 | 
				
			||||||
 | 
					                   version ".tar.gz"))
 | 
				
			||||||
 | 
					             (sha256
 | 
				
			||||||
 | 
					              (base32 "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq"))
 | 
				
			||||||
 | 
					             (modules '((guix build utils)))
 | 
				
			||||||
 | 
					             (snippet
 | 
				
			||||||
 | 
					              '(begin
 | 
				
			||||||
 | 
					                 ;; Somehow 'config.h.in' is older than
 | 
				
			||||||
 | 
					                 ;; 'aclocal.m4', which would trigger a rule to
 | 
				
			||||||
 | 
					                 ;; run 'autoheader'.
 | 
				
			||||||
 | 
					                 (set-file-time "config.h.in"
 | 
				
			||||||
 | 
					                                (stat "aclocal.m4"))
 | 
				
			||||||
 | 
					                 #t))))
 | 
				
			||||||
 | 
					    (build-system gnu-build-system)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public json-c-0.12
 | 
				
			||||||
 | 
					  (package
 | 
				
			||||||
 | 
					    (inherit json-c-0.13)
 | 
				
			||||||
    (version "0.12.1")
 | 
					    (version "0.12.1")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
             (method url-fetch)
 | 
					             (method url-fetch)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue