Commit Graph

3788 Commits

Author SHA1 Message Date
github-actions[bot]
de136681f7
Merge master into staging-next 2021-06-29 06:04:18 +00:00
R. RyanTM
f717dcafbf avocode: 4.14.3 -> 4.15.0 2021-06-29 02:39:04 +00:00
github-actions[bot]
dcfd9788a1
Merge master into staging-next 2021-06-29 00:10:52 +00:00
Sandro
a9a0ec0414
Merge pull request #128077 from doronbehar/pkg/imagej 2021-06-28 23:41:32 +02:00
Doron Behar
796ae067c4 imagej: 150 -> 153 2021-06-27 20:10:48 +03:00
Doron Behar
0750062126 imagej: Add desktop item and icon 2021-06-27 20:10:48 +03:00
Doron Behar
e1d6051d81 imagej: reformat expression
- Use 1 line per input argument.
- Don't use let ... in if not needed.
- Use ${version} in url string.
- Run hooks in explicit installPhase.
2021-06-27 19:41:23 +03:00
github-actions[bot]
ff0ea63da1
Merge staging-next into staging 2021-06-27 06:08:04 +00:00
Anderson Torres
f5b9a25cdd
Merge pull request #123378 from eduardosm/sip_6
python3Packages.sip: 5.5.0 -> 6.1.1;
pythonPackages.pyqt5: 5.15.2 -> 5.15.4;
python3Packages.pyqt-builder: 1.6.0 -> 1.10.1
2021-06-27 01:41:19 -03:00
Eduardo Sánchez Muñoz
52457525ad veusz: fix PyQt5 sip path and use sip 4
veusz tries to use the `sip` binary, which is no longer available in sip 6
2021-06-27 00:59:55 +02:00
Eduardo Sánchez Muñoz
7079b4c050 krita: fix PyQt5 SIP path 2021-06-27 00:25:13 +02:00
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
Martin Weinelt
40bb731ec7
Merge pull request #127151 from NixOS/staging-next 2021-06-26 14:45:48 +02:00
Jan Tojnar
69015ede61
Merge pull request #128037 from jtojnar/inkscape-app-trans
inkscape-extensions.applytransforms: 0.0.0+unstable=2021-05-11
2021-06-26 14:44:51 +02:00
github-actions[bot]
947012b992
Merge staging-next into staging 2021-06-26 00:09:11 +00:00
Robert Schütz
d6234c2165 Merge branch 'master' into staging-next 2021-06-26 00:33:58 +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
Dmitry Kalinkin
9959bb87e8
Merge pull request #127522 from rytone/ocio2
blender: Switch to OpenColorIO 2.x
2021-06-25 10:39:43 -04:00
github-actions[bot]
be086cc67b
Merge staging-next into staging 2021-06-25 12:06:08 +00:00
github-actions[bot]
bae6b2055f
Merge master into staging-next 2021-06-25 12:06:04 +00:00
Jan Tojnar
5efd65b2d9
inkscape-with-extension: make enabling all extensions easier
Previously, we needed something like

	inkscape-with-extensions.override { inkscapeExtensions = builtins.filter lib.isDerivation (builtins.attrValues inkscape-extensions); }

Now, we can just do

	inkscape-with-extensions.override { inkscapeExtensions = null; }
2021-06-25 12:41:11 +02:00
Jan Tojnar
75ea980211
inkscape-extensions.applytransforms: 0.0.0+unstable=2021-05-11 2021-06-25 12:41:11 +02:00
Robert Schütz
b6cdaa5b75 megapixels: 1.0.1 -> 1.1.0
https://git.sr.ht/~martijnbraam/megapixels/refs/1.1.0
2021-06-25 09:23:06 +02:00
Justin Restivo
77c3d60b89
imagemagick: add liquid rescale build option 2021-06-24 21:11:41 -04:00
Jan Tojnar
a5252d1f00
inkscape: Fix parsing paths by Python extensions 2021-06-25 01:20:07 +02:00
Maxwell Beck
de8a4f1741
opencolorio: Replace with 2.x
All applications besides Blender have been pinned to 1.x
2021-06-23 19:43:44 -05:00
github-actions[bot]
1f528e6ac6
Merge staging-next into staging 2021-06-24 00:06:31 +00:00
github-actions[bot]
d437a6cac2
Merge master into staging-next 2021-06-24 00:06:27 +00:00
Martin Weinelt
b262d7d569
Merge pull request #127846 from dotlambda/spyder_3-drop 2021-06-23 21:15:20 +02:00
Robert Schütz
cf4e702b2c cq-editor: use default version of spyder 2021-06-23 11:52:05 +02:00
github-actions[bot]
3db2949911
Merge staging-next into staging 2021-06-23 06:04:29 +00:00
github-actions[bot]
c54b530a39
Merge master into staging-next 2021-06-23 06:04:26 +00:00
R. RyanTM
24b29d114e avocode: 4.14.1 -> 4.14.3 2021-06-22 17:34:03 -07: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
Martin Weinelt
eef9694ebc
Merge branch 'master' into staging-next 2021-06-22 00:58:31 +02:00
laikq
9943455f94 veusz: init at 3.3.1 2021-06-18 19:57:08 +02:00
github-actions[bot]
8b9fa8d446
Merge staging-next into staging 2021-06-16 18:04:48 +00:00
github-actions[bot]
2d104c99a7
Merge master into staging-next 2021-06-16 18:04:45 +00:00
Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Robert Schütz
d86f21194a
Merge pull request #127058 from r-ryantm/auto-update/krita
krita: 4.4.3 -> 4.4.5
2021-06-16 19:15:40 +02:00
R. RyanTM
c3967b6406 krita: 4.4.3 -> 4.4.5 2021-06-16 08:49:36 +00:00
github-actions[bot]
f060a3768b
Merge master into staging-next 2021-06-16 06:04:41 +00:00
R. RyanTM
c78d3f3ecd avocode: 4.14.0 -> 4.14.1 2021-06-15 20:04:52 -07: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
Ricardo M. Correia
945c021476 imv: clarify license
licenses.gpl2 is deprecated, either gpl2Only or gpl2Plus should be
specified. However, imv is dual-licensed under the GPL and MIT licenses.

MIT is the one in the root LICENSE file, it's the one that Github shows
in  the main repo page and is also the more permissive one, therefore I
changed it to licenses.mit.
2021-06-14 00:32:05 +02:00
Ricardo M. Correia
2732a344bb imv: remove unused fontconfig argument 2021-06-14 00:32:05 +02:00
Ricardo M. Correia
54f77325e7 imv: install .desktop file 2021-06-14 00:32:05 +02: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
Jan Tojnar
ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
github-actions[bot]
da8d931c82
Merge master into staging-next 2021-06-10 06:07:24 +00:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
github-actions[bot]
e40e33d9d8
Merge staging-next into staging 2021-06-08 18:16:30 +00:00
github-actions[bot]
e8f8906d68
Merge master into staging-next 2021-06-08 18:16:27 +00:00
Jordan Justen
d6714cd18b
renderdoc: 1.13 -> 1.14
Signed-off-by: Jordan Justen <jljusten@gmail.com>
2021-06-06 03:02:54 -07:00
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