diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-03 09:48:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-03 09:48:58 +0200 |
| commit | d1a89ae9d702a4b91b6d661af256552e330bb995 (patch) | |
| tree | b34b95d1204ad7b4423b10cf1572d11b3293319f /pkgs/tools/archivers | |
| parent | 343ad1697d6967b7aa949752fd5c4471f691b4eb (diff) | |
| parent | 0b1c8793fc20944b68562d9a73a5ce391f1603e0 (diff) | |
| download | nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.gz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.bz2 nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.lz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.xz nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.tar.zst nixlib-d1a89ae9d702a4b91b6d661af256552e330bb995.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 8e9db09147ed..3550b7d7de36 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -10,9 +10,10 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/p/p7zip/16.02+dfsg-2/debian/patches/12-CVE-2016-9296.patch"; - sha256 = "1i7099h27gmb9dv0lb7jnqfm504gs1c3129r6kvi94yb2gzrzk41"; + (fetchpatch rec { + name = "CVE-2016-9296.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d"; + sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m"; }) ]; |