diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-05-01 17:57:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 17:57:41 +0200 |
| commit | 27b7e2f7dae0ab57746320e1900f3175ad7f2847 (patch) | |
| tree | d7304615c986ae7762a88b46b00a530d930de0f1 /pkgs | |
| parent | ba4fd61630f9ed1693c097699d4c9872eab22845 (diff) | |
| parent | 6d57c280c6ffde27d7fed7c86d62446491ec8bcc (diff) | |
| download | nixlib-27b7e2f7dae0ab57746320e1900f3175ad7f2847.tar nixlib-27b7e2f7dae0ab57746320e1900f3175ad7f2847.tar.gz nixlib-27b7e2f7dae0ab57746320e1900f3175ad7f2847.tar.bz2 nixlib-27b7e2f7dae0ab57746320e1900f3175ad7f2847.tar.lz nixlib-27b7e2f7dae0ab57746320e1900f3175ad7f2847.tar.xz nixlib-27b7e2f7dae0ab57746320e1900f3175ad7f2847.tar.zst nixlib-27b7e2f7dae0ab57746320e1900f3175ad7f2847.zip | |
Merge pull request #25392 from armijnhemel/json-c
json-c: 0.12 -> 0.12.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/json-c/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/json-c/unused-variable.patch | 18 |
2 files changed, 2 insertions, 22 deletions
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index da12b732d00a..b8c72d9669e0 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "json-c-0.12"; + name = "json-c-0.12.1"; src = fetchurl { url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz"; - sha256 = "0dgvjjyb9xva63l6sy70sdch2w4ryvacdmfd3fg2f2v13lqx5mkg"; + sha256 = "148jkvpnxmg1fwwigp0nq9qbd5vzpnmgiw3y34w7k6fymalpsqas"; }; - patches = [ ./unused-variable.patch ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook ]; # won't configure without it, no idea why diff --git a/pkgs/development/libraries/json-c/unused-variable.patch b/pkgs/development/libraries/json-c/unused-variable.patch deleted file mode 100644 index 1726234c526d..000000000000 --- a/pkgs/development/libraries/json-c/unused-variable.patch +++ /dev/null @@ -1,18 +0,0 @@ -See https://groups.google.com/forum/#!topic/json-c/TYodemkG338 -diff --git a/json_tokener.c b/json_tokener.c -index 19de8ef..32bc8af 100644 ---- a/json_tokener.c -+++ b/json_tokener.c -@@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok, - - case json_tokener_state_inf: /* aka starts with 'i' */ - { -- int size; - int size_inf; - int is_negative = 0; - - printbuf_memappend_fast(tok->pb, &c, 1); -- size = json_min(tok->st_pos+1, json_null_str_len); - size_inf = json_min(tok->st_pos+1, json_inf_str_len); - char *infbuf = tok->pb->buf; - if (*infbuf == '-') |