public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-21.05' into release-21.05

Browse Source 
It's a bit older version of the branch, as it has binaries from
https://hydra.nixos.org/eval/1674261
This commit is contained in:
Vladimír Čunát 2021-06-02 13:59:29 +02:00
commit 4b04e53f2a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/compression/lz4/default.nix
View File

@ -14,6 +14,19 @@ stdenv.mkDerivation rec {
owner = pname; owner = pname;
}; };
patches = [
(fetchpatch { # https://github.com/lz4/lz4/pull/972
name = "CVE-2021-3520.patch";
url = "https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7.patch";
sha256 = "0r1cwpqdkdc8im0pf2r5jp7mwwn69xcw405rrk7rc0mpjcp5ydfk";
})
(fetchpatch { # https://github.com/lz4/lz4/pull/973
name = "avoid-null-pointer-dereference.patch";
url = "https://github.com/lz4/lz4/commit/29a6a1f4941e7243241fe00d6c13b749fd6b60c2.patch";
sha256 = "0v5yl5hd3qrfm3xm7m06j4b21qwllb4cqkjn2az7x1vnzqgpf8y7";
})
];
# TODO(@Ericson2314): Separate binaries and libraries # TODO(@Ericson2314): Separate binaries and libraries
outputs = [ "bin" "out" "dev" ]; outputs = [ "bin" "out" "dev" ];