diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-01-06 04:23:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 04:23:57 +0000 |
| commit | 901626782d0f51538fa926dcb047079db2ee5d49 (patch) | |
| tree | 10832f3ae2a6d8686b1dedfbd3f79097749058b9 /pkgs/applications/graphics | |
| parent | 757b94765fadff4b71d0a5ffa0f621f5b3cc6fe6 (diff) | |
| parent | 7d409d58058346eeac71299dab513b97fde4ec00 (diff) | |
| download | nixlib-901626782d0f51538fa926dcb047079db2ee5d49.tar nixlib-901626782d0f51538fa926dcb047079db2ee5d49.tar.gz nixlib-901626782d0f51538fa926dcb047079db2ee5d49.tar.bz2 nixlib-901626782d0f51538fa926dcb047079db2ee5d49.tar.lz nixlib-901626782d0f51538fa926dcb047079db2ee5d49.tar.xz nixlib-901626782d0f51538fa926dcb047079db2ee5d49.tar.zst nixlib-901626782d0f51538fa926dcb047079db2ee5d49.zip | |
Merge pull request #33324 from adisbladis/imagemagick
Imagemagick minor releases
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 98e2c0e3f7d4..e1d8dd01f9c5 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-14"; - sha256 = "04hpc9i6fp09iy0xkidlfhfqr7zg45izqqj5fx93n3dxalq65xqw"; + version = "7.0.7-19"; + sha256 = "1naib6hspmq7d4gfpsksx78gc1lq3p2v3i9pxkkdvr9p9j15c4az"; patches = []; }; in diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index e3500a621cbb..519bf025b43e 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -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 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-26"; - sha256 = "10rcq7b9hhz50m4yqnm4g3iai7lr9jkglb7sm49ycw59arrkmwnw"; + version = "6.9.9-28"; + sha256 = "132kdl7jlkghfg3smdab14c29cpvrx65ibipxkmwg1nc88ycqivh"; patches = []; } # 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}"; inherit (cfg) version; - src = fetchurl { - urls = [ - "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" - # the original source above removes tarballs quickly - "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" - "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" - ]; + src = fetchFromGitHub { + owner = "ImageMagick"; + repo = "ImageMagick"; + rev = cfg.version; inherit (cfg) sha256; }; |