From b5ca1a173104157e32798a9a7a3b13924e745ab0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 5 Nov 2020 07:34:56 +0000 Subject: [PATCH] json_c: 0.14 -> 0.15 https://github.com/json-c/json-c/blob/json-c-0.15-20200726/ChangeLog --- pkgs/development/libraries/json-c/default.nix | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 164f7c44ba9..d72d5021434 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,20 +1,13 @@ -{ stdenv, fetchurl, fetchpatch, cmake }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "json-c-0.14"; - src = fetchurl { - url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz"; - sha256 = "1yia8417qljmczs9w3rn4c4i2p2iywq098pgrj11s81599j4x4cr"; - }; + pname = "json-c"; + version = "0.15"; - 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"; - }) - ]; + src = fetchurl { + url = "https://s3.amazonaws.com/json-c_releases/releases/${pname}-${version}.tar.gz"; + sha256 = "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q"; + }; outputs = [ "out" "dev" ];