Robert Scott
99d13e8c01
Merge pull request #125361 from andir/staging/graphicsmagic-closure-bloat
...
[staging] graphicsmagic: reduce runtime closure bloat
2021-06-05 12:17:00 +01:00
github-actions[bot]
0b0d0c21ec
Merge staging-next into staging
2021-06-04 13:00:29 +00:00
github-actions[bot]
065a1dcee6
Merge master into staging-next
2021-06-04 13:00:24 +00:00
polygon
5e903ee079
nufraw: fix build
...
Sources would include glib-headers from within an extern-C scope.
Since glib-headers contained templates, this would fail. Add a patch
to move the header includes outside of the extern-C scope.
2021-06-04 08:26:06 +02:00
github-actions[bot]
b511c637c8
Merge staging-next into staging
2021-06-03 19:52:05 +00:00
github-actions[bot]
a9f286f5cf
Merge master into staging-next
2021-06-03 19:52:02 +00:00
Sandro
46cd89039e
Merge pull request #125258 from cpcloud/add-giflib-to-oiio
...
openimageio2: add giflib dependency
2021-06-03 17:47:24 +02:00
Sandro
ee91003786
Merge pull request #125257 from mingmingrr/master
...
pythonPackages.hydrus: 438 -> 441
2021-06-03 17:34:21 +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]
a261aaf9c2
Merge staging-next into staging
2021-06-02 13:08:16 +00:00
github-actions[bot]
9e56e764cd
Merge master into staging-next
2021-06-02 13:08:13 +00:00
Andreas Rammhold
a1ab165b81
graphicsmagick: reduce runtime closure size
...
Before this commit we had libxml and freetype development files as part
of the runtime closure of graphicsmagick. Both of these combined added
up to 2MiB. With this commit those references are now gone :-)
2021-06-02 12:57:34 +02:00
Michele Guerini Rocco
b5f2aa78c7
Merge pull request #124891 from cwyc/fix-antimony-desktop-file
...
antimony: add desktop item
2021-06-02 10:15:01 +02:00
github-actions[bot]
2908f0cd18
Merge staging-next into staging
2021-06-02 02:32:54 +00:00
github-actions[bot]
c8ea5daaaf
Merge master into staging-next
2021-06-02 02:32:51 +00:00
Sandro
839713a179
Merge pull request #125096 from SebTM/update/sane-airscan_09926
2021-06-01 22:50:50 +02:00
mingmingrr
03956aa12b
pythonPackages.hydrus: 438 -> 441
2021-06-01 15:59:35 -04:00
cwyc
b80463f8d5
antimony: add desktop item
2021-06-01 15:23:42 -04:00
Phillip Cloud
c8ec847d48
openimageio2: add giflib dependency
2021-06-01 13:11:49 -04: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
Jörg Thalheim
f40605db9c
Merge pull request #125150 from zhaofengli/imagemagick-gcc-arch
...
imagemagick: Allow compilation without --with-gcc-arch
2021-06-01 06:49:20 +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
github-actions[bot]
abef57f931
Merge staging-next into staging
2021-05-31 19:44:15 +00:00
github-actions[bot]
7f14676873
Merge master into staging-next
2021-05-31 19:44:13 +00:00
Kerstin Humm
31a8c0e5c4
imagemagick: 7.0.11-13 -> 7.0.11-14
2021-05-31 21:15:45 +02:00
Maciej Krüger
ef555f6a0b
Merge pull request #123426 from mattchrist/brscan5
2021-05-31 17:52:16 +02:00
Sebastian Sellmeier
19120ab497
sane-airscan: 0.99.24 -> 0.99.26
2021-05-31 16:36:26 +02:00
github-actions[bot]
f8a73160e3
Merge staging-next into staging
2021-05-26 12:31:58 +00:00
github-actions[bot]
df4ebfc46c
Merge master into staging-next
2021-05-26 12:31:55 +00:00
Jordan Justen
413d927150
inkscape: 1.0.2 -> 1.1
...
Reworks:
* Remove fetchpatch
* Remove gdl (jtojnar)
* gtkspell -> gspell (jtojnar)
* Add pillow to fix jpg export (jtojnar)
* Remove double-conversion, add substituteInPlace (jtojnar)
2021-05-26 00:20:44 -07:00
github-actions[bot]
26e0f79db0
Merge staging-next into staging
2021-05-24 01:00:32 +00:00
github-actions[bot]
a8835232ec
Merge master into staging-next
2021-05-24 01:00:29 +00:00
Guillaume Girol
f1721209f0
Merge pull request #124086 from sikmir/qvge
...
qvge: 0.6.2 → 0.6.3
2021-05-23 20:48:52 +00: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
Nikolay Korotkiy
740c34ac9f
qvge: 0.6.2 → 0.6.3
2021-05-23 03:37:25 +03:00
github-actions[bot]
d0c1f6a78f
Merge staging-next into staging
2021-05-22 12:27:12 +00:00
github-actions[bot]
563389a7fd
Merge master into staging-next
2021-05-22 12:27:09 +00:00
timput
d0755bdb5f
freecad: add openscad file support
2021-05-21 21:07:55 -06:00
github-actions[bot]
9fb5041877
Merge staging-next into staging
2021-05-22 00:56:06 +00:00
github-actions[bot]
901fb5e64e
Merge master into staging-next
2021-05-22 00:56:03 +00:00
Matt Christ
a9b7300f6f
brscan5: init at 1.2.6-0
2021-05-21 12:59:30 -05:00
Meghea Iulian
01f0665aac
avocode: add missing deps
2021-05-21 09:02:54 +03:00
github-actions[bot]
9c9882ecd9
Merge staging-next into staging
2021-05-19 18:34:13 +00:00
Jonathan Ringer
c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
nixos/doc/manual/release-notes/rl-2105.xml
pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
Vladimír Čunát
7cefeafb11
Merge #122934 : krita: add breeze-icons
2021-05-19 09:17:58 +02: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
Jonathan Ringer
ca46ad3762
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/package-management/cargo-release/default.nix
2021-05-18 11:03:38 -07:00
Kerstin Humm
1738b9877a
imagemagick: 7.0.11-9 -> 7.0.11-12
2021-05-18 19:47:33 +02:00
