diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:35:19 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:35:19 +0200 |
| commit | 679136e25258760f9991cdbb8d26440e666daf78 (patch) | |
| tree | 6675bdf0983876aa26417101492a5c54e30efcc3 /pkgs/development/libraries/json-c/default.nix | |
| parent | 7a3be9661438e1e59592fd3fbc7198b88842d1cd (diff) | |
| parent | bef20b38efca840135d7f174f5044d098a7deca2 (diff) | |
| download | nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.gz nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.bz2 nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.lz nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.xz nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.zst nixlib-679136e25258760f9991cdbb8d26440e666daf78.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/json-c/default.nix')
| -rw-r--r-- | pkgs/development/libraries/json-c/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 81ebc7baeb06..a3ddfe4c63c5 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf }: +{ stdenv, fetchurl, fetchpatch, autoconf }: stdenv.mkDerivation rec { name = "json-c-0.13.1"; @@ -7,6 +7,15 @@ stdenv.mkDerivation rec { sha256 = "0ch1v18wk703bpbyzj7h1mkwvsw4rw4qdwvgykscypvqq10678ll"; }; + 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"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoconf ]; # for autoheader |