[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
30/63: gnu: json-c: Update to 0.14.
From: |
guix-commits |
Subject: |
30/63: gnu: json-c: Update to 0.14. |
Date: |
Mon, 25 May 2020 15:15:24 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 8864bced6df0310c470d352a50e874b54e0a0499
Author: Marius Bakke <address@hidden>
AuthorDate: Thu May 14 22:54:27 2020 +0200
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.
---
gnu/packages/cryptsetup.scm | 4 ++--
gnu/packages/linux.scm | 2 +-
gnu/packages/security-token.scm | 6 +++---
gnu/packages/syndication.scm | 2 +-
gnu/packages/web.scm | 39 ++++++++++++++++++++++++++-------------
5 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index d4c039a..bd6e046 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/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")
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3fd902e..b45b372 100644
--- a/gnu/packages/linux.scm
+++ b/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)
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 2ab8a85..d742c62 100644
--- a/gnu/packages/security-token.scm
+++ b/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)
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 5bc3d19..658050c 100644
--- a/gnu/packages/syndication.scm
+++ b/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)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index eabc3c0..1ccab77 100644
--- a/gnu/packages/web.scm
+++ b/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)
- 12/63: gnu: libical: Update to 3.0.8., (continued)
- 12/63: gnu: libical: Update to 3.0.8., guix-commits, 2020/05/25
- 13/63: gnu: mesa: Build with LLVM 10., guix-commits, 2020/05/25
- 20/63: gnu: python-cryptography: Update to 2.9.2., guix-commits, 2020/05/25
- 14/63: gnu: cups-filters: Update to 1.27.4., guix-commits, 2020/05/25
- 15/63: gnu: CUPS: Update to 2.3.3., guix-commits, 2020/05/25
- 16/63: gnu: GTK+: Update to 3.24.20., guix-commits, 2020/05/25
- 18/63: gnu: python-cffi: Update to 1.14.0., guix-commits, 2020/05/25
- 21/63: gnu: python-pyopenssl: Update to 19.1.0., guix-commits, 2020/05/25
- 22/63: gnu: python-urllib3: Update to 1.25.9., guix-commits, 2020/05/25
- 17/63: gnu: python-pycairo: Update to 1.19.1., guix-commits, 2020/05/25
- 30/63: gnu: json-c: Update to 0.14.,
guix-commits <=
- 31/63: gnu: python-jinja2: Update to 2.11.2., guix-commits, 2020/05/25
- 19/63: gnu: python-certifi: Update to 2020.4.5.1., guix-commits, 2020/05/25
- 24/63: gnu: python-cython: Update to 0.29.17., guix-commits, 2020/05/25
- 25/63: gnu: python-pycparser: Update to 2.20., guix-commits, 2020/05/25
- 27/63: gnu: python-mako: Update to 1.1.2., guix-commits, 2020/05/25
- 28/63: gnu: NSS: Update to 3.52., guix-commits, 2020/05/25
- 32/63: gnu: KDE Frameworks: Update to 5.70., guix-commits, 2020/05/25
- 35/63: gnu: NSS: Update to 3.52.1 [fixes CVE-2020-12399]., guix-commits, 2020/05/25
- 37/63: gnu: cogl: Fix build with Mesa 20., guix-commits, 2020/05/25
- 40/63: gnu: spirv-tools: Update to 2020.2., guix-commits, 2020/05/25