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: 2ef4001b950e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a391aca77f87
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 18, 2017

  1. ImageMagick: 6.9.9-0 -> 6.9.9-3 

    (cherry picked from commit bde8a15)
    @NeQuissimus @fpletz
    NeQuissimus authored and fpletz committed Aug 18, 2017
    Copy the full SHA
    d33b18c View commit details

  2. ImageMagick: 7.0.6-1 -> 7.0.6-4 

    (cherry picked from commit 5e26dbe)
    @NeQuissimus @fpletz
    NeQuissimus authored and fpletz committed Aug 18, 2017
    Copy the full SHA
    6fd82d7 View commit details

  3. imagemagick: 6.9.9-3 -> 6.9.9-7 

    The old release has been removed from https://www.imagemagick.org/download/releases/ causing new builds to fail.

(cherry picked from commit b4c7d59)
    @phunehehe @fpletz
    phunehehe authored and fpletz committed Aug 18, 2017
    Copy the full SHA
    a391aca View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/graphics/ImageMagick/7.0.nix
  2. +2 −2 pkgs/applications/graphics/ImageMagick/default.nix
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-1";
sha256 = "1i3gsc0ps7cbvfmnk6fbi5hng18jwh4x4dqbz90a45x85023w9vs";
version = "7.0.6-4";
sha256 = "0fvkx9lf8g0sa9bccd9s5qyhcy0g1mqnkbpqly55ryxyg1ywxqaz";
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.9-0";
sha256 = "02xnvgjnmz2d4yv4iy1kh7an5w631p1s319jw23c8zpmqhfhk2ha";
version = "6.9.9-7";
sha256 = "1lwsz9b8clygdppgawv2hsry4aykgmawjlwhg3fj70rndv4a8rw4";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.