Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e4d6399c8644
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ccb5642ccbce
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 18, 2017

  1. imagemagick: 6.9.8-10 -> 6.9.9-0 

    (cherry picked from commit 0e9676f)
    @fpletz
    fpletz committed Jul 18, 2017
    Copy the full SHA
    e6acc07 View commit details

  2. imagemagick7: 7.0.6-0 -> 7.0.6-1 

    (cherry picked from commit cff27d5)
    @fpletz
    fpletz committed Jul 18, 2017
    Copy the full SHA
    9cbba51 View commit details

  3. graphicsmagick: 1.3.25 -> 1.3.26 

    (cherry picked from commit cb23448)
    @fpletz
    fpletz committed Jul 18, 2017
    Copy the full SHA
    ccb5642 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/ImageMagick/7.0.nix
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ let
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "7.0.6-0";
sha256 = "1vl9mkdp5pskl4lxd1p79ayv1k3gxpa8iz992d302qyllhm7wn1i";
version = "7.0.6-1";
sha256 = "1i3gsc0ps7cbvfmnk6fbi5hng18jwh4x4dqbz90a45x85023w9vs";
patches = [];
};
in
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/ImageMagick/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ let
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "6.9.8-10";
sha256 = "040qs7nwcm84bjd9wryvd58zqfykbmn3y3qfc90lnldww7v6ihlg";
version = "6.9.9-0";
sha256 = "02xnvgjnmz2d4yv4iy1kh7an5w631p1s319jw23c8zpmqhfhk2ha";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
36 changes: 0 additions & 36 deletions pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch
View file

This file was deleted.

33 changes: 2 additions & 31 deletions pkgs/applications/graphics/graphicsmagick/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,47 +2,18 @@
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
, libwebp, quantumdepth ? 8 }:

let version = "1.3.25"; in
let version = "1.3.26"; in

stdenv.mkDerivation {
name = "graphicsmagick-${version}";

src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn";
sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v";
};

patches = [
./disable-popen.patch
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7996_CVE-2016-7997.patch";
sha256 = "0xsby2z8n7cnnln7szjznq7iaabq323wymvdjra59yb41aix74r2";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part1.patch";
sha256 = "02s0x9bkbnm5wrd0d2x9ld4d9z5xqpfk310lyylyr5zlnhqxmwgn";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part2.patch";
sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8682.patch";
sha256 = "1wfirw2yi5y72657kvnbgjs0f9b3rs9nvk8gjbwhb9a03z9ws0y5";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8683.patch";
sha256 = "102252zb34nj6alk1nhh1wbn3apd2v9rzk7clmm237332yj72vif";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch";
sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy";
})
(fetchpatch {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch";
sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa";
})
./cmyka-bounds.patch
];

configureFlags = [