about summary refs log tree commit diff
path: root/pkgs/development/libraries/json-c
diff options
context:
space:
mode:
authorTredwellGit <tredwell@tutanota.com>2020-11-05 07:34:56 +0000
committerAlyssa Ross <hi@alyssa.is>2020-11-09 11:59:49 +0000
commitb5ca1a173104157e32798a9a7a3b13924e745ab0 (patch)
tree8a081a949ebd09414009b4eabc1294b47afb63af /pkgs/development/libraries/json-c
parent971aef5e0876e3c88de20329f8d183b416ec8ade (diff)
json_c: 0.14 -> 0.15
https://github.com/json-c/json-c/blob/json-c-0.15-20200726/ChangeLog
Diffstat (limited to 'pkgs/development/libraries/json-c')
-rw-r--r--pkgs/development/libraries/json-c/default.nix19
1 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index 164f7c44ba9df..d72d502143486 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -1,21 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, cmake }:
+{ stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "json-c-0.14";
+  pname = "json-c";
+  version = "0.15";
+
   src = fetchurl {
-    url    = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz";
-    sha256 = "1yia8417qljmczs9w3rn4c4i2p2iywq098pgrj11s81599j4x4cr";
+    url    = "https://s3.amazonaws.com/json-c_releases/releases/${pname}-${version}.tar.gz";
+    sha256 = "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q";
   };
 
-  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/5d6fa331418d49f1bd488553fd1cfa9ab023fabb.patch";
-      sha256 = "0aar7kgbycqxnhh0lrr61adfbb903nbapalhs5i6h8anxwy1ylcm";
-    })
-  ];
-
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ cmake ];