about summary refs log tree commit diff
path: root/pkgs/development/libraries/json-c
diff options
context:
space:
mode:
authorMartin Milata <martin@martinmilata.cz>2020-06-18 12:34:51 +0200
committerMartin Milata <martin@martinmilata.cz>2020-07-02 18:30:23 +0200
commit9e7f109ef7ea0ebbfe271c2a2b10d06b35ce1acc (patch)
treede1cace21a3bfc40e6799b1cd11337582135c6d9 /pkgs/development/libraries/json-c
parent7e5bfbc85e4864dc580954587f585cda7fbe5dcd (diff)
json_c: 0.13.1 -> 0.14
Changes: https://github.com/json-c/json-c/blob/json-c-0.14-20200419/ChangeLog
Diffstat (limited to 'pkgs/development/libraries/json-c')
-rw-r--r--pkgs/development/libraries/json-c/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index c7a9b3c4a1256..164f7c44ba9df 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, fetchpatch, autoconf }:
+{ stdenv, fetchurl, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "json-c-0.13.1";
+  name = "json-c-0.14";
   src = fetchurl {
     url    = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz";
-    sha256 = "0ch1v18wk703bpbyzj7h1mkwvsw4rw4qdwvgykscypvqq10678ll";
+    sha256 = "1yia8417qljmczs9w3rn4c4i2p2iywq098pgrj11s81599j4x4cr";
   };
 
   patches = [
     # https://nvd.nist.gov/vuln/detail/CVE-2020-12762
     (fetchpatch {
       name = "CVE-2020-12762.patch";
-      url = "https://github.com/json-c/json-c/commit/865b5a65199973bb63dff8e47a2f57e04fec9736.patch";
-      sha256 = "1g5afk4khhm1sb70xrva1pyznshcw3ipzp1g5z60dpzxy303pp6h";
+      url = "https://github.com/json-c/json-c/commit/5d6fa331418d49f1bd488553fd1cfa9ab023fabb.patch";
+      sha256 = "0aar7kgbycqxnhh0lrr61adfbb903nbapalhs5i6h8anxwy1ylcm";
     })
   ];
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ autoconf ];  # for autoheader
+  nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     description = "A JSON implementation in C";