pyrox.dev
Merge pull request #25392 from armijnhemel/json-c
json-c: 0.12 -> 0.12.1
authored by Jörg Thalheim and committed by GitHub 27b7e2f7 ba4fd616
+2
-4
pkgs/development/libraries/json-c/default.nix
+2
-4
pkgs/development/libraries/json-c/default.nix
···
1
1
{ stdenv, fetchurl, autoreconfHook }:
2
2
3
3
stdenv.mkDerivation rec {
4
-
name = "json-c-0.12";
4
+
name = "json-c-0.12.1";
5
5
src = fetchurl {
6
6
url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz";
7
-
sha256 = "0dgvjjyb9xva63l6sy70sdch2w4ryvacdmfd3fg2f2v13lqx5mkg";
7
+
sha256 = "148jkvpnxmg1fwwigp0nq9qbd5vzpnmgiw3y34w7k6fymalpsqas";
8
8
};
9
-
10
-
patches = [ ./unused-variable.patch ];
11
9
12
10
outputs = [ "out" "dev" ];
13
11
-18
pkgs/development/libraries/json-c/unused-variable.patch
-18
pkgs/development/libraries/json-c/unused-variable.patch
···
1
-
See https://groups.google.com/forum/#!topic/json-c/TYodemkG338
2
-
diff --git a/json_tokener.c b/json_tokener.c
3
-
index 19de8ef..32bc8af 100644
4
-
--- a/json_tokener.c
5
-
+++ b/json_tokener.c
6
-
@@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
7
-
8
-
case json_tokener_state_inf: /* aka starts with 'i' */
9
-
{
10
-
- int size;
11
-
int size_inf;
12
-
int is_negative = 0;
13
-
14
-
printbuf_memappend_fast(tok->pb, &c, 1);
15
-
- size = json_min(tok->st_pos+1, json_null_str_len);
16
-
size_inf = json_min(tok->st_pos+1, json_inf_str_len);
17
-
char *infbuf = tok->pb->buf;
18
-
if (*infbuf == '-')