3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

91 commits

Author SHA1 Message Date
Kerstin Humm 937dae1dad
imagemagick: 7.1.0-2 -> 7.1.0-4 2021-07-18 23:15:39 +02:00
Robert Schütz 071e8ee2f7 imagemagick7: 7.1.0-1 -> 7.1.0-2 2021-06-26 16:42:21 +02:00
Sandro 6b4b3deaed
Merge pull request #83149 from DieracDelta/fix/imagemagick-default
imagemagick: add liquid rescale build option
2021-06-25 19:17:02 +02:00
Justin Restivo 77c3d60b89
imagemagick: add liquid rescale build option 2021-06-24 21:11:41 -04:00
Kerstin Humm 1688ff519b
imagemagick: 7.1.0-0 -> 7.1.0-1 2021-06-22 11:45:57 +02:00
Robert Schütz 162e6eaa34 imagemagick: 7.0.11-14 -> 7.1.0-0 2021-06-13 21:30:00 +02:00
Sandro 67897e581c
Merge pull request #125119 from erictapen/imagemagick-7.0.11-14
imagemagick: 7.0.11-13 -> 7.0.11-14
2021-06-03 17:11:49 +02:00
github-actions[bot] 15d7e7d545
Merge staging-next into staging 2021-06-01 07:50:24 +00:00
github-actions[bot] 65e3e9dc51
Merge master into staging-next 2021-06-01 07:50:21 +00:00
Zhaofeng Li 990431c1e3 imagemagick: Allow compilation without --with-gcc-arch
The --with-gcc-arch flag is used to specify the value used for
--march and --mtune [1], therefore it does not make sense to fail the
evaluation simply because it's not enumerated by us. However,
it's necessary to specify --without-gcc-arch, otherwise the config
script will guess the values and lead to incompatible / non-determinstic
artifacts.

[1] 850d5a9fc5/m4/ax_gcc_archflag.m4
2021-05-31 18:40:34 -07:00
Kerstin Humm 31a8c0e5c4
imagemagick: 7.0.11-13 -> 7.0.11-14 2021-05-31 21:15:45 +02:00
Luke Granger-Brown 0afc94a9ff
Merge pull request #123582 from erictapen/imagemagick-7.0.11-13
imagemagick: 7.0.11-12 -> 7.0.11-13
2021-05-23 15:17:35 +01:00
Kerstin Humm c2521a6b36
imagemagick: 7.0.11-12 -> 7.0.11.13 2021-05-18 22:40:33 +02:00
Robert Schütz 09a617cdf7
Merge pull request #123225 from erictapen/imagemagick-7.0.11-12
imagemagick: 7.0.11-9 -> 7.0.11-12
2021-05-18 21:15:35 +02:00
Kerstin Humm 1738b9877a
imagemagick: 7.0.11-9 -> 7.0.11-12 2021-05-18 19:47:33 +02:00
Jonathan del Strother c022642fec imagemagick: support aarch64-darwin 2021-05-17 00:28:04 +09:00
github-actions[bot] 12193913a1
Merge staging-next into staging 2021-05-07 12:23:21 +00:00
Jan Tojnar 9468b07326
Merge branch 'gnome-40' 2021-05-07 12:12:40 +02:00
Arnout Engelen b68130fd2c
test-utilities: version test
Extract 'version test' to a reusable test utility as discussed in
https://github.com/NixOS/nixpkgs/pull/119636#issuecomment-826137021 and
2021-05-07 09:53:35 +02:00
Jan Tojnar 26e044b14a
imagemagick: Try to fix Darwin build 2021-05-05 22:43:09 +02:00
github-actions[bot] b4766e97ee
Merge staging-next into staging 2021-04-30 00:52:06 +00:00
Samuel Gräfenstein bbcb63c308
imagemagick7: add meta.mainProgram 2021-04-29 14:59:31 +02:00
R. RyanTM 922271cc19 imagemagick: 7.0.11-8 -> 7.0.11-9 2021-04-29 13:26:44 +02:00
Justin Humm 4a96500414 imagemagick: 7.0.11-6 -> 7.0.11-8 2021-04-23 22:27:14 +02:00
Justin Humm a19afca416 imagemagick7: 7.0.11-5 -> 7.0.11-6 2021-04-09 23:06:25 +02:00
Justin Humm 59ae7ec7f7 imagemagick7: 7.0.11-4 -> 7.0.11-5
Also removed an unnecessary let binding.
2021-04-01 20:57:10 +02:00
Justin Humm 2a85dbda12 imagemagick: 7.0.11.3 -> 7.0.11-4
Changelog: https://github.com/ImageMagick/ImageMagick/blob/7.0.11-4/ChangeLog
2021-03-21 12:41:35 +01:00
Justin Humm e22e25f5aa imagemagick: add erictapen as maintainer 2021-03-15 00:05:41 +01:00
Justin Humm 7d7ccbd1de imagemagick: 7.0.10-61 -> 7.0.11-3 2021-03-15 00:05:41 +01:00
R. RyanTM 442a8644fe imagemagick7: 7.0.10-46 -> 7.0.10-61 2021-02-07 10:07:00 +00:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
R. RyanTM 3139f42543 imagemagick7: 7.0.10-35 -> 7.0.10-46 2020-12-09 02:56:01 +00:00
R. RyanTM 9217752561 imagemagick7: 7.0.10-27 -> 7.0.10-35 2020-11-02 07:30:15 +00:00
Ryan Burns 5f265ce646 imagemagick: enable on ppc64le 2020-10-02 18:46:18 -07:00
R. RyanTM 4887eb493f imagemagick7: 7.0.10-25 -> 7.0.10-27 2020-08-15 15:27:05 -07:00
R. RyanTM b9d13c1819 imagemagick7: 7.0.10-19 -> 7.0.10-25 2020-08-03 08:34:51 +00:00
Maximilian Bosch f95acb5cc6
imagemagick7: 7.0.10-17 -> 7.0.10-19, fix build w/glibc-2.31 2020-06-29 14:41:42 +02:00
R. RyanTM 2e264a8908 imagemagick7: 7.0.10-14 -> 7.0.10-17 2020-06-11 10:30:33 -07:00
Frederik Rietdijk 36d9eeb9c7 Merge staging-next into staging 2020-05-29 17:06:01 +02:00
zowoq fd3d93a3e2 imagemagick7: 7.0.9-0 -> 7.0.10-14 2020-05-24 10:49:48 +10:00
John Ericson ee8cfe4bf3 treewide: pkg-config has targetPrefix 2020-05-16 00:21:21 +00:00
Jörg Thalheim 887295fd2d
treewide: remove the-kenny from maintainers
@the-kenny did a good job in the past and is set as maintainer in many package,
however since 2017-2018 he stopped contributing. To create less confusion
in pull requests when people try to request his feedback, I removed him as
maintainer from all packages.
2020-05-09 10:28:57 +01:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Robert Scott 1b44b12c57 imagemagick7: 7.0.8-68 -> 7.0.9-0 2019-10-27 13:06:55 +00:00
R. RyanTM eb6ad6e959 imagemagick7: 7.0.8-66 -> 7.0.8-68
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/imagemagick/versions
2019-10-22 10:17:20 +02:00
R. RyanTM 5852497f3c imagemagick7: 7.0.8-58 -> 7.0.8-66
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/imagemagick/versions
2019-10-01 08:24:05 -07:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

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

to pname
2019-08-15 13:41:18 +01:00