diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-14 22:54:27 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:32:55 +0200 |
| commit | beec29da921345c2e46852c531161fb5ddd3076f (patch) | |
| tree | 502749990bfea9865cdd8880dabff2dc69d87b76 /gnu | |
| parent | f2ff01bb8e794ead5d31548505c840caf6a9aa39 (diff) | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/cryptsetup.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/security-token.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/syndication.scm | 2 | ||||
| -rw-r--r-- | 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 d4c039ac04c..bd6e0464524 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | `(("pkg-config" ,pkg-config))) | 58 | `(("pkg-config" ,pkg-config))) |
| 59 | (inputs | 59 | (inputs |
| 60 | `(("argon2" ,argon2) | 60 | `(("argon2" ,argon2) |
| 61 | ("json-c" ,json-c) | 61 | ("json-c" ,json-c-0.13) ;XXX update this for cryptsetup >= 2.3 |
| 62 | ("libgcrypt" ,libgcrypt) | 62 | ("libgcrypt" ,libgcrypt) |
| 63 | ("lvm2" ,lvm2) ; device-mapper | 63 | ("lvm2" ,lvm2) ; device-mapper |
| 64 | ("popt" ,popt) | 64 | ("popt" ,popt) |
| @@ -138,7 +138,7 @@ files). This assumes LIBRARY uses Libtool." | |||
| 138 | (inherit (static-library libgcrypt)) | 138 | (inherit (static-library libgcrypt)) |
| 139 | (propagated-inputs | 139 | (propagated-inputs |
| 140 | `(("libgpg-error-host" ,(static-library libgpg-error))))))) | 140 | `(("libgpg-error-host" ,(static-library libgpg-error))))))) |
| 141 | `(("json-c" ,json-c) | 141 | `(("json-c" ,json-c-0.13) |
| 142 | ("libgcrypt" ,libgcrypt-static) | 142 | ("libgcrypt" ,libgcrypt-static) |
| 143 | ("lvm2" ,lvm2-static) | 143 | ("lvm2" ,lvm2-static) |
| 144 | ("util-linux" ,util-linux "static") | 144 | ("util-linux" ,util-linux "static") |
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3fd902e3404..b45b3725d46 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm | |||
| @@ -4243,7 +4243,7 @@ arrays when needed.") | |||
| 4243 | ("pkg-config" ,pkg-config) | 4243 | ("pkg-config" ,pkg-config) |
| 4244 | ("valgrind" ,valgrind))) | 4244 | ("valgrind" ,valgrind))) |
| 4245 | (inputs | 4245 | (inputs |
| 4246 | `(("json-c" ,json-c) | 4246 | `(("json-c" ,json-c-0.13) |
| 4247 | ("libaio" ,libaio) | 4247 | ("libaio" ,libaio) |
| 4248 | ("liburcu" ,liburcu) | 4248 | ("liburcu" ,liburcu) |
| 4249 | ("lvm2" ,lvm2) | 4249 | ("lvm2" ,lvm2) |
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 2ab8a857022..d742c6255c0 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.") | |||
| 357 | (assoc-ref %outputs "out") | 357 | (assoc-ref %outputs "out") |
| 358 | "/lib/udev/rules.d")))) | 358 | "/lib/udev/rules.d")))) |
| 359 | (inputs | 359 | (inputs |
| 360 | `(("json-c" ,json-c) | 360 | `(("json-c" ,json-c-0.13) |
| 361 | ("libusb" ,libusb) | 361 | ("libusb" ,libusb) |
| 362 | ;; The library "libyubikey" is also known as "yubico-c". | 362 | ;; The library "libyubikey" is also known as "yubico-c". |
| 363 | ("libyubikey" ,libyubikey))) | 363 | ("libyubikey" ,libyubikey))) |
| @@ -457,7 +457,7 @@ PCSC API Python wrapper module.") | |||
| 457 | "/xml/dtd/docbook/docbookx.dtd"))) | 457 | "/xml/dtd/docbook/docbookx.dtd"))) |
| 458 | #t))))) | 458 | #t))))) |
| 459 | (inputs | 459 | (inputs |
| 460 | `(("json-c" ,json-c) | 460 | `(("json-c" ,json-c-0.13) |
| 461 | ("hidapi" ,hidapi))) | 461 | ("hidapi" ,hidapi))) |
| 462 | (native-inputs | 462 | (native-inputs |
| 463 | `(("help2man" ,help2man) | 463 | `(("help2man" ,help2man) |
| @@ -497,7 +497,7 @@ operations.") | |||
| 497 | (list "--enable-gtk-doc" | 497 | (list "--enable-gtk-doc" |
| 498 | "--enable-tests"))) | 498 | "--enable-tests"))) |
| 499 | (inputs | 499 | (inputs |
| 500 | `(("json-c" ,json-c) | 500 | `(("json-c" ,json-c-0.13) |
| 501 | ("libressl" ,libressl))) | 501 | ("libressl" ,libressl))) |
| 502 | (native-inputs | 502 | (native-inputs |
| 503 | `(("autoconf" ,autoconf) | 503 | `(("autoconf" ,autoconf) |
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 5bc3d19a923..658050c54df 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | ("asciidoc" ,asciidoc))) | 57 | ("asciidoc" ,asciidoc))) |
| 58 | (inputs | 58 | (inputs |
| 59 | `(("curl" ,curl) | 59 | `(("curl" ,curl) |
| 60 | ("json-c" ,json-c) | 60 | ("json-c" ,json-c-0.13) |
| 61 | ("libxml2" ,libxml2) | 61 | ("libxml2" ,libxml2) |
| 62 | ("ncurses" ,ncurses) | 62 | ("ncurses" ,ncurses) |
| 63 | ("stfl" ,stfl) | 63 | ("stfl" ,stfl) |
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eabc3c0197a..1ccab7777b5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm | |||
| @@ -768,7 +768,7 @@ data.") | |||
| 768 | (define-public json-c | 768 | (define-public json-c |
| 769 | (package | 769 | (package |
| 770 | (name "json-c") | 770 | (name "json-c") |
| 771 | (version "0.13.1") | 771 | (version "0.14") |
| 772 | (source (origin | 772 | (source (origin |
| 773 | (method url-fetch) | 773 | (method url-fetch) |
| 774 | (uri (string-append | 774 | (uri (string-append |
| @@ -776,7 +776,29 @@ data.") | |||
| 776 | version ".tar.gz")) | 776 | version ".tar.gz")) |
| 777 | (sha256 | 777 | (sha256 |
| 778 | (base32 | 778 | (base32 |
| 779 | "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq")) | 779 | "0w381krr99q5a2rypx4g437fa7gzgl82i64sgnrs6g5jr44dwxxk")))) |
| 780 | (build-system cmake-build-system) | ||
| 781 | (home-page "https://github.com/json-c/json-c/wiki") | ||
| 782 | (synopsis "JSON implementation in C") | ||
| 783 | (description | ||
| 784 | "JSON-C implements a reference counting object model that allows you to | ||
| 785 | easily construct JSON objects in C, output them as JSON-formatted strings and | ||
| 786 | parse JSON-formatted strings back into the C representation of JSON objects. | ||
| 787 | It aims to conform to RFC 7159.") | ||
| 788 | (license license:x11))) | ||
| 789 | |||
| 790 | ;; TODO: Remove these old versions when all dependents have been updated. | ||
| 791 | (define-public json-c-0.13 | ||
| 792 | (package | ||
| 793 | (inherit json-c) | ||
| 794 | (version "0.13.1") | ||
| 795 | (source (origin | ||
| 796 | (method url-fetch) | ||
| 797 | (uri (string-append | ||
| 798 | "https://s3.amazonaws.com/json-c_releases/releases/json-c-" | ||
| 799 | version ".tar.gz")) | ||
| 800 | (sha256 | ||
| 801 | (base32 "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq")) | ||
| 780 | (modules '((guix build utils))) | 802 | (modules '((guix build utils))) |
| 781 | (snippet | 803 | (snippet |
| 782 | '(begin | 804 | '(begin |
| @@ -786,20 +808,11 @@ data.") | |||
| 786 | (set-file-time "config.h.in" | 808 | (set-file-time "config.h.in" |
| 787 | (stat "aclocal.m4")) | 809 | (stat "aclocal.m4")) |
| 788 | #t)))) | 810 | #t)))) |
| 789 | (build-system gnu-build-system) | 811 | (build-system gnu-build-system))) |
| 790 | (home-page "https://github.com/json-c/json-c/wiki") | ||
| 791 | (synopsis "JSON implementation in C") | ||
| 792 | (description | ||
| 793 | "JSON-C implements a reference counting object model that allows you to | ||
| 794 | easily construct JSON objects in C, output them as JSON-formatted strings and | ||
| 795 | parse JSON-formatted strings back into the C representation of JSON objects. | ||
| 796 | It aims to conform to RFC 7159.") | ||
| 797 | (license license:x11))) | ||
| 798 | 812 | ||
| 799 | ;; TODO: remove this old version when all dependents have been updated. | ||
| 800 | (define-public json-c-0.12 | 813 | (define-public json-c-0.12 |
| 801 | (package | 814 | (package |
| 802 | (inherit json-c) | 815 | (inherit json-c-0.13) |
| 803 | (version "0.12.1") | 816 | (version "0.12.1") |
| 804 | (source (origin | 817 | (source (origin |
| 805 | (method url-fetch) | 818 | (method url-fetch) |
