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

freeimage: fetchpatch -> fetchurl

Browse Source 
These aren't generated patches, so there's no benefit in fetchpatch.
/cc #30729.
This commit is contained in:
Vladimír Čunát 2017-10-24 21:31:53 +02:00
parent a3dde9d13d
commit 1e32c3ee35
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/freeimage/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchpatch, fetchurl, unzip, darwin }:
{ stdenv, fetchurl, unzip, darwin }:
stdenv.mkDerivation {
name = "freeimage-3.17.0";
@ -8,14 +8,16 @@ stdenv.mkDerivation {
sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v";
};
patches = [
(fetchpatch {
url = "https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches/Fix-CVE-2015-0852.patch";
sha256 = "0qkb96mvvhji75gz7dma3vj2b71smp96z3kl2ydj6skvnw6slnmc";
patches = let
patchURL = https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches;
in [
(fetchurl {
url = patchURL + "/Fix-CVE-2015-0852.patch";
sha256 = "1vxdck4i5qi5j6i3cjja0gfy79mmbf0lq2qdrnqdsl4kclbvw2c8";
})
(fetchpatch {
url = "https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches/Fix-CVE-2016-5684.patch";
sha256 = "18g5ckrvqfjcldis7zf7hmfl8b3mgnc6akd6x3cdq8c5j7l1y98f";
(fetchurl {
url = patchURL + "/Fix-CVE-2016-5684.patch";
sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3";
})
];