diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/json-c | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/json-c')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/json-c/default.nix | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/json-c/default.nix b/nixpkgs/pkgs/development/libraries/json-c/default.nix index 164f7c44ba9d..d72d50214348 100644 --- a/nixpkgs/pkgs/development/libraries/json-c/default.nix +++ b/nixpkgs/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 ]; |