JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imagemagick: make 7.0 default

Browse Source
This commit is contained in:
Robert Schütz 2021-02-22 14:17:52 +01:00
parent d60f67d486
commit 5cc881d0d8
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -524,6 +524,14 @@ self: super:
data from the device and mix it into the kernel's RNG. data from the device and mix it into the kernel's RNG.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The default version of ImageMagick has been updated from 6 to 7.
You can use <package>imagemagick6</package>,
<package>imagemagick6_light</package>, and
<package>imagemagick6Big</package> if you need the older version.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

0
pkgs/applications/graphics/ImageMagick/default.nix → pkgs/applications/graphics/ImageMagick/6.x.nix
View File

3
pkgs/top-level/aliases.nix
View File

@ -286,6 +286,9 @@ mapAliases ({
icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
idea = jetbrains; # added 2017-04-03 idea = jetbrains; # added 2017-04-03
imagemagick7_light = imagemagick_light; # added 2021-02-22
imagemagick7 = imagemagick; # added 2021-02-22
imagemagick7Big = imagemagickBig; # added 2021-02-22
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
infiniband-diags = rdma-core; # added 2019-08-09 infiniband-diags = rdma-core; # added 2019-08-09
inotifyTools = inotify-tools; inotifyTools = inotify-tools;

12
pkgs/top-level/all-packages.nix
View File

@ -23069,7 +23069,7 @@ in
imagej = callPackage ../applications/graphics/imagej { }; imagej = callPackage ../applications/graphics/imagej { };
imagemagick_light = imagemagick.override { imagemagick6_light = imagemagick6.override {
bzip2 = null; bzip2 = null;
zlib = null; zlib = null;
libX11 = null; libX11 = null;
@ -23092,14 +23092,14 @@ in
libde265 = null; libde265 = null;
}; };
imagemagick = callPackage ../applications/graphics/ImageMagick { imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;
ghostscript = null; ghostscript = null;
}; };
imagemagickBig = imagemagick.override { inherit ghostscript; }; imagemagick6Big = imagemagick6.override { inherit ghostscript; };
imagemagick7_light = lowPrio (imagemagick7.override { imagemagick_light = lowPrio (imagemagick.override {
bzip2 = null; bzip2 = null;
zlib = null; zlib = null;
libX11 = null; libX11 = null;
@ -23121,11 +23121,11 @@ in
libheif = null; libheif = null;
}); });
imagemagick7 = lowPrio (imagemagick7Big.override { imagemagick = lowPrio (imagemagickBig.override {
ghostscript = null; ghostscript = null;
}); });
imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;
}); });