colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
298,971 Commits 125 Branches 0 Tags 3.4 GiB
947012b992
Commit Graph

3719 Commits

Author SHA1 Message Date
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
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
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