Commit graph

3738 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