Commit Graph

201 Commits

Author SHA1 Message Date
Robert Schütz
547fb093c3 imagemagick6: 6.9.12-14 -> 6.9.12-15 2021-06-13 20:48:11 +02:00
Kerstin Humm
99f12af681 imagemagick: 6.9.12-12 -> 6.9.12-14 2021-06-11 16:34:41 +02: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
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Robert Schütz
333994ca6a
Merge pull request #123227 from erictapen/imagemagick-6.9.12-12
imagemagick6: 6.9.12.8 -> 6.9.12-12
2021-05-16 22:27:55 +02:00
Jonathan del Strother
c022642fec imagemagick: support aarch64-darwin 2021-05-17 00:28:04 +09:00
Kerstin Humm
f1d61e1b4b
imagemagick6: 6.9.12.8 -> 6.9.12-12 2021-05-16 13:21:54 +02:00
Jonathan Ringer
0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
Stéphan Kochen
006d7f80eb
imagemagick6: fix darwin build (#123023) 2021-05-14 16:21:38 -04: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
Robert Schütz
d7bb0e5087
Merge pull request #120456 from erictapen/imagemagick-7.0.11-8
imagemagick: 7.0.11-6 -> 7.0.11-8
2021-04-24 00:53:04 +02:00
Justin Humm
4a96500414 imagemagick: 7.0.11-6 -> 7.0.11-8 2021-04-23 22:27:14 +02:00
Justin Humm
31f0207ac1 imagemagick6: 6.9.12-3 -> 6.9.12-8 2021-04-23 22:21:04 +02:00
Justin Humm
a19afca416 imagemagick7: 7.0.11-5 -> 7.0.11-6 2021-04-09 23:06:25 +02:00
Sandro
2efec1b83f
Merge pull request #118277 from erictapen/imagemagick-7.0.11-5
imagemagick7: 7.0.11-4 -> 7.0.11-5
2021-04-02 02:36:21 +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
Robert Schütz
f53b98ca01
Merge pull request #117114 from erictapen/imagemagick-7.0.11-4
imagemagick: 7.0.11-3 -> 7.0.11-4
2021-03-21 15:48:10 +01: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
Robert Schütz
1f13d0df6e
Merge pull request #116332 from erictapen/imagemagick-7.0.11-3
imagemagick: 7.0.10-61 -> 7.0.11-3
2021-03-16 13:24:42 +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
Justin Humm
c528ddd2da imagemagick6: add erictapen as maintainer 2021-03-14 20:22:47 +01:00
Justin Humm
3210e9158f imagemagick6: 6.9.12-1 -> 6.9.12-3 2021-03-14 20:22:38 +01:00
Robert Schütz
7ac6fbfe5a
imagemagick6: 6.9.11-60 -> 6.9.12-1 (#113998) 2021-02-27 19:12:43 +01:00
Robert Schütz
5cc881d0d8 imagemagick: make 7.0 default 2021-02-27 18:34:36 +01:00
R. RyanTM
442a8644fe imagemagick7: 7.0.10-46 -> 7.0.10-61 2021-02-07 10:07:00 +00:00
Robert Schütz
fd892478a1 imagemagick: 6.9.11-57 -> 6.9.11-60 2021-01-30 11:57:12 +01:00
ajs124
c41de40237 imagemagick: 6.9.11-29 -> 6.9.11-57 2021-01-30 11:51:15 +01:00
ajs124
da0d4925f5 imagemagick: drop broken MinGW support 2021-01-30 11:51:12 +01: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
ajs124
083b64c63f imagemagick: 6.9.11-14 -> 6.9.11-29 2020-09-30 11:20:53 +10: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
zowoq
9efb29f978 imagemagick: 6.9.10-71 -> 6.9.11-14 2020-05-24 10:49:39 +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