Browse Source

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.
gn-latest-20200725
Marius Bakke 1 year ago
committed by Marius Bakke
parent
commit
beec29da92
No known key found for this signature in database GPG Key ID: A2A06DF2A33A54FA
  1. 4
      gnu/packages/cryptsetup.scm
  2. 2
      gnu/packages/linux.scm
  3. 6
      gnu/packages/security-token.scm
  4. 2
      gnu/packages/syndication.scm
  5. 39
      gnu/packages/web.scm

4
gnu/packages/cryptsetup.scm

@ -58,7 +58,7 @@
`(("pkg-config" ,pkg-config)))
(inputs
`(("argon2" ,argon2)
("json-c" ,json-c)
("json-c" ,json-c-0.13) ;XXX update this for cryptsetup >= 2.3
("libgcrypt" ,libgcrypt)
("lvm2" ,lvm2) ; device-mapper
("popt" ,popt)
@ -138,7 +138,7 @@ files). This assumes LIBRARY uses Libtool."
(inherit (static-library libgcrypt))
(propagated-inputs
`(("libgpg-error-host" ,(static-library libgpg-error)))))))
`(("json-c" ,json-c)
`(("json-c" ,json-c-0.13)
("libgcrypt" ,libgcrypt-static)
("lvm2" ,lvm2-static)
("util-linux" ,util-linux "static")

2
gnu/packages/linux.scm

@ -4243,7 +4243,7 @@ arrays when needed.")
("pkg-config" ,pkg-config)
("valgrind" ,valgrind)))
(inputs
`(("json-c" ,json-c)
`(("json-c" ,json-c-0.13)
("libaio" ,libaio)
("liburcu" ,liburcu)
("lvm2" ,lvm2)

6
gnu/packages/security-token.scm

@ -357,7 +357,7 @@ and other operations. It includes a library and a command-line tool.")
(assoc-ref %outputs "out")
"/lib/udev/rules.d"))))
(inputs
`(("json-c" ,json-c)
`(("json-c" ,json-c-0.13)
("libusb" ,libusb)
;; The library "libyubikey" is also known as "yubico-c".
("libyubikey" ,libyubikey)))
@ -457,7 +457,7 @@ PCSC API Python wrapper module.")
"/xml/dtd/docbook/docbookx.dtd")))
#t)))))
(inputs
`(("json-c" ,json-c)
`(("json-c" ,json-c-0.13)
("hidapi" ,hidapi)))
(native-inputs
`(("help2man" ,help2man)
@ -497,7 +497,7 @@ operations.")
(list "--enable-gtk-doc"
"--enable-tests")))
(inputs
`(("json-c" ,json-c)
`(("json-c" ,json-c-0.13)
("libressl" ,libressl)))
(native-inputs
`(("autoconf" ,autoconf)

2
gnu/packages/syndication.scm

@ -57,7 +57,7 @@
("asciidoc" ,asciidoc)))
(inputs
`(("curl" ,curl)
("json-c" ,json-c)
("json-c" ,json-c-0.13)
("libxml2" ,libxml2)
("ncurses" ,ncurses)
("stfl" ,stfl)

39
gnu/packages/web.scm

@ -768,7 +768,7 @@ data.")
(define-public json-c
(package
(name "json-c")
(version "0.13.1")
(version "0.14")
(source (origin
(method url-fetch)
(uri (string-append
@ -776,7 +776,29 @@ data.")
version ".tar.gz"))
(sha256
(base32
"0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq"))
"0w381krr99q5a2rypx4g437fa7gzgl82i64sgnrs6g5jr44dwxxk"))))
(build-system cmake-build-system)
(home-page "https://github.com/json-c/json-c/wiki")
(synopsis "JSON implementation in C")
(description
"JSON-C implements a reference counting object model that allows you to
easily construct JSON objects in C, output them as JSON-formatted strings and
parse JSON-formatted strings back into the C representation of JSON objects.
It aims to conform to RFC 7159.")
(license license:x11)))
;; TODO: Remove these old versions when all dependents have been updated.
(define-public json-c-0.13
(package
(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
@ -786,20 +808,11 @@ data.")
(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")
(synopsis "JSON implementation in C")
(description
"JSON-C implements a reference counting object model that allows you to
easily construct JSON objects in C, output them as JSON-formatted strings and
parse JSON-formatted strings back into the C representation of JSON objects.
It aims to conform to RFC 7159.")
(license license:x11)))
(build-system gnu-build-system)))
;; TODO: remove this old version when all dependents have been updated.
(define-public json-c-0.12
(package
(inherit json-c)
(inherit json-c-0.13)
(version "0.12.1")
(source (origin
(method url-fetch)

Loading…
Cancel
Save