diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 23:28:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-29 10:01:22 +0100 |
| commit | e740b565cf01082be314dff8833c4a65a834bcff (patch) | |
| tree | 59e8ce4fd4ecf004581e1f1eed533970fd6eba69 /pkgs/applications/graphics/ImageMagick/default.nix | |
| parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
| parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) | |
| download | nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.gz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.bz2 nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.lz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.xz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.zst nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.zip | |
Merge master into stdenv-updates
Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index a3d6eca4fa6..66a7f334dbd 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -18,14 +18,14 @@ }: let - version = "6.8.7-5"; + version = "6.8.7-6"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "1cn1kg7scs6r7r00qlqirhnmqjnmyczbidab3vgqarw9qszh2ri6"; + sha256 = "0cbfhk184kxdxz5czyyqxac29mbfiahygjji6k97z6hp8ngnqlvh"; }; enableParallelBuilding = true; |