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: f5a4cc87ece9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0b13f4ac14ab
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 2, 2021

  1. imagemagick7: 7.0.11-4 -> 7.0.11-5 

    Also removed an unnecessary let binding.

(cherry picked from commit 59ae7ec)
    @erictapen @dotlambda
    erictapen authored and dotlambda committed Apr 2, 2021
    Copy the full SHA
    0b13f4a View commit details
Showing with 4 additions and 12 deletions.
  1. +4 −12 pkgs/applications/graphics/ImageMagick/7.0.nix
16 changes: 4 additions & 12 deletions pkgs/applications/graphics/ImageMagick/7.0.nix
View file
Original file line number Diff line number Diff line change
@@ -11,27 +11,19 @@ let
else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l"
else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64"
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "7.0.11-4";
sha256 = "sha256-Dwlt3EdDoRkJKm1gepDC+0QdKEkMVsacZQ7khnxmWto=";
patches = [];
};
in

stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "imagemagick";
inherit (cfg) version;
version = "7.0.11-5";

src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = cfg.version;
inherit (cfg) sha256;
rev = version;
sha256 = "sha256-HJUC8lUHORZMHvSv1/EYM+JOsd89quFaU1Fz08AckG8=";
};

patches = cfg.patches;

outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
outputMan = "out"; # it's tiny