Commit Graph

3431 Commits

Author SHA1 Message Date
github-actions[bot]
a941c67936
Merge staging-next into staging 2021-03-22 00:45:55 +00:00
github-actions[bot]
226884645e
Merge master into staging-next 2021-03-22 00:45:52 +00:00
Sandro
cf62dcbd6e
Merge pull request #115164 from mingmingrr/master
pythonPackages.hydrus: 426 -> 431
2021-03-21 21:20:21 +01: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
github-actions[bot]
6f6e1d46b4
Merge master into staging-next 2021-03-21 12:26:00 +00: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
Guillaume Girol
584f971216
Merge pull request #113707 from symphorien/sane-backends-udpate
sane-backends: 1.0.30 -> 1.0.32
2021-03-21 11:03:04 +00:00
Symphorien Gibol
c20cd1834f sane-backends: 1.0.30 -> 1.0.32
sane-backends-git: remove, it's not updated often enough to be useful
2021-03-21 11:07:14 +01:00
Martin Weinelt
ec8267c539
Merge branch 'master' into staging-next 2021-03-21 02:22:36 +01:00
koslambrou
dc88d47a5c
eddy: init at 1.2.1 (#115261)
Co-authored-by: kolam <kolam@tuta.io>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-20 19:57:08 +01:00
github-actions[bot]
11187b30ca
Merge staging-next into staging 2021-03-20 06:21:50 +00:00
Martin Weinelt
4abc71dd99
Merge pull request #111133 from r-ryantm/auto-update/batik
batik: 1.13 -> 1.14
2021-03-20 02:13:38 +01:00
github-actions[bot]
6e3a55e059
Merge staging-next into staging 2021-03-19 18:19:40 +00:00
Frederik Rietdijk
1ecb97eae9 Merge master into staging-next 2021-03-19 18:17:01 +01:00
Anderson Torres
af20ac46a8
Merge pull request #116786 from MatthewCroughan/freecad-flatmesh
freecad: add flatmesh library via '-D BUILD_FLAT_MESH:BOOL=ON'
2021-03-19 09:59:38 -03:00
github-actions[bot]
8c03075f07
Merge staging-next into staging 2021-03-19 00:41:08 +00:00
github-actions[bot]
d73a492e83
Merge master into staging-next 2021-03-19 00:41:01 +00:00
Anderson Torres
d4bbefe480
Merge pull request #116783 from MatthewCroughan/freecad-symlink
freecad: symlink uppercase executable names to lowercase in postFixup
2021-03-18 20:16:37 -03:00
matthewcroughan
93ec1d1b71 freecad: add flatmesh library via '-D BUILD_FLAT_MESH:BOOL=ON'
It's arguable that the FreeCAD flatmesh library should be included by default.
The upstream FreeCAD appimages are provided with this library compiled in.

See the following:
77a6470107
5bcddb3b86

Update pkgs/applications/graphics/freecad/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-18 22:46:57 +00:00
Jan Tojnar
39bc2f7abe
gimp: Fix crash without dot
GEGL 0.4.28 started marking introspect action as unavailable when dot is not present.
But GIMP previously required the action to be present at startup, even though it was only ever used in dev builds.
Let’s apply an upstream patch that removes this strict requirement.
2021-03-18 22:18:51 +01:00
matthewcroughan
6a31db4e8f freecad: symlink uppercase executable names to lowercase in postFixup
When a user installs this package, it's likely they will try to run 'freecad' instead of 'FreeCAD', this symlinks FreeCAD -> freecad such that the user will not be confused and assume that installation of the package did not work properly.
2021-03-18 20:54:35 +00:00
Jan Tojnar
0136206b12
Merge branch 'master' into staging-next 2021-03-18 13:35:59 +01:00
Anderson Torres
3c61ca9620
Merge pull request #116517 from AndersonTorres/freecad
freecad: unstable-2020-12-08 -> 0.19.1
2021-03-17 16:51:26 -03:00
Peter Hoeg
fc14612d12 leocad: 19.07.1 -> 21.03 2021-03-17 19:34:21 +08:00
WORLDofPEACE
effe752c61
Merge pull request #116407 from r-ryantm/auto-update/fondo
fondo: 1.5.1 -> 1.5.2
2021-03-16 23:26:20 -04:00
AndersonTorres
b1b91fc640 freecad: unstable-2020-12-08 -> 0.19.1 2021-03-16 12:24:56 -03: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
github-actions[bot]
dec95bae4a
Merge master into staging-next 2021-03-15 12:25:41 +00:00
R. RyanTM
1ce3a1ab36 fondo: 1.5.1 -> 1.5.2 2021-03-15 12:19:08 +00:00
R. RyanTM
420c7f1e8c photoflare: 1.6.6 -> 1.6.7 2021-03-15 03:16:15 -04:00
github-actions[bot]
e7b44e6f52
Merge master into staging-next 2021-03-15 06:18:46 +00:00
Sandro
2484046c5a
Merge pull request #116346 from jansol/renderdoc
renderdoc: 1.11 -> 1.12
2021-03-15 01:51:45 +01:00
github-actions[bot]
8fa4dca9b5
Merge master into staging-next 2021-03-15 00:40:27 +00:00
Jan Solanti
b78770a1ee renderdoc: 1.11 -> 1.12 2021-03-15 01:37:25 +02: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
Justin Humm
c528ddd2da imagemagick6: add erictapen as maintainer 2021-03-14 20:22:47 +01:00
Justin Humm
3210e9158f imagemagick6: 6.9.12-1 -> 6.9.12-3 2021-03-14 20:22:38 +01:00
Jan Tojnar
01a4d350c7
Merge branch 'master' into staging-next
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict.

It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
2021-03-13 19:16:43 +01:00
omg
b31f3593ed photoflare: fix warnings
- set license to gpl3Plus
- remove unnecessary `enableParallelBuilding` parameter
2021-03-13 11:52:31 +04:00
github-actions[bot]
903fc48674
Merge master into staging-next 2021-03-12 00:39:51 +00:00
OPNA2608
48497dbd25 megapixels: 0.14.0 -> 0.15.0 2021-03-11 17:41:47 +01:00
mingmingrr
fea9710ec2 pythonPackages.hydrus: 426 -> 431 2021-03-10 16:12:38 -05:00
Martin Weinelt
16f9e4da3a
Merge branch 'master' into staging-next 2021-03-09 17:05:41 +01:00
R. RyanTM
8090d83920 sane-airscan: 0.99.16 -> 0.99.24 2021-03-09 13:50:50 +01:00
Frederik Rietdijk
277d488026 Merge staging into staging-next 2021-03-08 19:20:18 +01:00
Lassulus
e93cc0e9c6
Merge pull request #112679 from ronthecookie/pkg-blockbench
blockbench-electron: init at 3.7.5
2021-03-07 17:12:54 +01:00
Jan Tojnar
3f2e5044ce
Merge branch 'staging-next' into staging 2021-03-05 20:39:38 +01:00
Dmitry Kalinkin
88237f6545
Merge pull request #114270 from veprbl/pr/graphicsmagick_full_paths
graphicsmagick: set full paths to delegates such as ghostscript
2021-03-05 09:37:16 -05:00
Jan Tojnar
6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00