JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
300,168 Commits 2 Branches 0 Tags 12 GiB
6cead635ad
Commit Graph

224 Commits

Author SHA1 Message Date
github-actions[bot]
8f71a7f335
Merge staging-next into staging 2021-06-26 18:04:40 +00:00
Robert Schütz
071e8ee2f7 imagemagick7: 7.1.0-1 -> 7.1.0-2 2021-06-26 16:42:21 +02:00
Robert Schütz
a93194815b imagemagick6: 6.9.12-16 -> 6.9.12-17 2021-06-26 16:41:14 +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
github-actions[bot]
b766664645
Merge staging-next into staging 2021-06-22 12:05:04 +00:00
github-actions[bot]
c7bb5a79c8
Merge master into staging-next 2021-06-22 12:05:00 +00:00
Robert Schütz
d2b489b24a imagemagick6: 6.9.12-15 -> 6.9.12-16 2021-06-22 12:50:33 +02:00
Robert Schütz
f6ca26a309
Merge pull request #127775 from erictapen/imagemagick-7.1.0-1 
imagemagick: 7.1.0-0 -> 7.1.0-1
 2021-06-22 12:44:21 +02:00
Kerstin Humm
1688ff519b
imagemagick: 7.1.0-0 -> 7.1.0-1 2021-06-22 11:45:57 +02:00
github-actions[bot]
9a860729b2
Merge staging-next into staging 2021-06-14 00:08:51 +00:00
github-actions[bot]
13f31f60bf
Merge master into staging-next 2021-06-14 00:08:48 +00:00
Robert Schütz
162e6eaa34 imagemagick: 7.0.11-14 -> 7.1.0-0 2021-06-13 21:30:00 +02:00
Robert Schütz
547fb093c3 imagemagick6: 6.9.12-14 -> 6.9.12-15 2021-06-13 20:48:11 +02:00
github-actions[bot]
8f3ead7190
Merge staging-next into staging 2021-06-11 18:05:09 +00:00
github-actions[bot]
69f9534853
Merge master into staging-next 2021-06-11 18:05:07 +00:00
Kerstin Humm
99f12af681 imagemagick: 6.9.12-12 -> 6.9.12-14 2021-06-11 16:34:41 +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 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