mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-24 06:08:16 +03:00
Merge pull request #33324 from adisbladis/imagemagick
Imagemagick minor releases
This commit is contained in:
commit
901626782d
@ -14,8 +14,8 @@ let
|
|||||||
else throw "ImageMagick is not supported on this platform.";
|
else throw "ImageMagick is not supported on this platform.";
|
||||||
|
|
||||||
cfg = {
|
cfg = {
|
||||||
version = "7.0.7-14";
|
version = "7.0.7-19";
|
||||||
sha256 = "04hpc9i6fp09iy0xkidlfhfqr7zg45izqqj5fx93n3dxalq65xqw";
|
sha256 = "1naib6hspmq7d4gfpsksx78gc1lq3p2v3i9pxkkdvr9p9j15c4az";
|
||||||
patches = [];
|
patches = [];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
|
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
|
||||||
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
|
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
|
||||||
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
|
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
|
||||||
, ApplicationServices
|
, ApplicationServices
|
||||||
@ -14,8 +14,8 @@ let
|
|||||||
else throw "ImageMagick is not supported on this platform.";
|
else throw "ImageMagick is not supported on this platform.";
|
||||||
|
|
||||||
cfg = {
|
cfg = {
|
||||||
version = "6.9.9-26";
|
version = "6.9.9-28";
|
||||||
sha256 = "10rcq7b9hhz50m4yqnm4g3iai7lr9jkglb7sm49ycw59arrkmwnw";
|
sha256 = "132kdl7jlkghfg3smdab14c29cpvrx65ibipxkmwg1nc88ycqivh";
|
||||||
patches = [];
|
patches = [];
|
||||||
}
|
}
|
||||||
# Freeze version on mingw so we don't need to port the patch too often.
|
# Freeze version on mingw so we don't need to port the patch too often.
|
||||||
@ -36,13 +36,10 @@ stdenv.mkDerivation rec {
|
|||||||
name = "imagemagick-${version}";
|
name = "imagemagick-${version}";
|
||||||
inherit (cfg) version;
|
inherit (cfg) version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
urls = [
|
owner = "ImageMagick";
|
||||||
"mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
|
repo = "ImageMagick";
|
||||||
# the original source above removes tarballs quickly
|
rev = cfg.version;
|
||||||
"http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
|
|
||||||
"https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"
|
|
||||||
];
|
|
||||||
inherit (cfg) sha256;
|
inherit (cfg) sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user