Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 971aef5e0876
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b5ca1a173104
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 9, 2020

  1. json_c: 0.14 -> 0.15 

    https://github.com/json-c/json-c/blob/json-c-0.15-20200726/ChangeLog
    @TredwellGit @alyssais
    TredwellGit authored and alyssais committed Nov 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b5ca1a1 View commit details
Showing with 6 additions and 13 deletions.
  1. +6 −13 pkgs/development/libraries/json-c/default.nix
19 changes: 6 additions & 13 deletions pkgs/development/libraries/json-c/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];