Peter Hoeg
6d2e24e80e
Merge pull request #69061 from Anton-Latukha/adopt-djview
...
djview: adopt, upd {descriptions, to qt5}, add features
2019-09-25 05:57:01 +08:00
Jörg Thalheim
fbfdaed210
Merge pull request #69036 from pacien/gscan2pdf-v2.5.6
...
gscan2pdf: 2.5.5 -> 2.5.6
2019-09-23 09:15:15 +01:00
Daniël de Kok
b7efd50e83
drawio: 11.1.4 -> 11.3.0
...
Changelogs:
https://github.com/jgraph/drawio-desktop/releases/tag/v11.3.0
https://github.com/jgraph/drawio-desktop/releases/tag/v11.3.0
Most salient change: fixes crash after print
2019-09-22 07:48:46 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
...
This reverts commit 41af38f372f0fec244ca
2019-09-21 20:05:09 +02:00
worldofpeace
ad09694ef3
Merge pull request #69145 from delroth/mcomix-setuptools
...
mcomix: add missing setuptools dependency
2019-09-21 13:19:24 -04:00
Anton-Latukha
cc7952401a
djview: {adopt, clean-up, doc, Qt(4 -> 5), add features}
...
djview: adopt
djview: upd description
djview: add longDescription
djview: upd to Qt5, use Qt5's mkDerivation
djview: add configureFlags (enabling couple features)
upd longDescription
djview: upd clean-up
2019-09-20 18:58:52 +03:00
Pierre Bourdon
eef06df7f5
mcomix: add missing setuptools dependency
2019-09-20 12:11:00 +02:00
Jan Tojnar
62791c3743
Merge branch 'master' into staging-next
2019-09-18 21:15:35 +02:00
pacien
518e23bcb8
gscan2pdf: 2.5.5 -> 2.5.6
2019-09-18 18:39:30 +02:00
Jan Tojnar
be4606dbe4
Merge pull request #67617 from dawidsowa/kcc
...
kcc: init at 5.5.1
2019-09-17 23:58:49 +02:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next
2019-09-15 13:18:54 +02:00
Franz Pletz
789760aa10
Merge pull request #68779 from mimame/update/maintainer
...
maintainer: mimadrid: update github username and personal data
2019-09-14 14:08:35 +00:00
Miguel Madrid Mencía
148c82e07e
maintainer: mimadrid: update github username and personal data
2019-09-14 12:15:46 +02:00
Will Dietz
dc25f13c5a
krita: 4.2.5 -> 4.2.6, gz -> xz
...
https://krita.org/en/item/krita-4-2-6-released/
2019-09-13 22:00:13 -05:00
danme
55a636055c
giv: removed
...
Because of a build error dropped for 19.09 (#68361 ).
2019-09-13 17:52:15 +02:00
Jan Tojnar
9b6789de73
tree-wide: replace wrapProgram with wrapGApp
...
where appropriate
2019-09-10 17:54:57 +02:00
Jan Tojnar
b27da0dde7
gmic & gmic-qt: update & clean-up ( #68257 )
...
gmic & gmic-qt: update & clean-up
2019-09-10 01:21:17 +02:00
Frederik Rietdijk
e3f25191c4
Merge staging-next into staging
2019-09-09 08:11:34 +02:00
Frederik Rietdijk
731c82a447
Merge pull request #68244 from NixOS/staging-next
...
Staging next that includes gcc8
2019-09-09 08:09:36 +02:00
volth
7b8fb5c06c
treewide: remove redundant quotes
2019-09-08 23:38:31 +00:00
Riley Inman
cd04b610ba
inkscape: add wrapGAppsHook for icons (fixed for strictDeps)
...
Resolves #68185 .
The icons in Inkscape depend on gdk-pixbuf loaders, but because
strictDeps is set to true to fix some macOS issues it doesn't work
(see #56943 ). Adding librsvg to buildInputs explicitly fixes the issue.
2019-09-08 14:51:12 -04:00
Frederik Rietdijk
5f4734b1dd
Merge remote-tracking branch 'upstream/gcc-8' into staging-next
...
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Jan Tojnar
d8749430e4
gmic-qt: allow building non-Krita hosts
...
* Use qt5’s mkDerivation
* Also switch gimpPlugins.gmic to qmic-qt
2019-09-07 19:55:11 +02:00
Frederik Rietdijk
66bc7fc1b3
Merge master into staging-next
2019-09-06 22:46:05 +02:00
Vladyslav M
8d7031a588
Merge pull request #68190 from markus1189/imv-4-0-1
...
imv: 3.1.2 -> 4.0.1
2019-09-06 22:50:40 +03:00
Doron Behar
f70e4c7d59
pdfcpu: 0.2.3 -> 0.2.4
2019-09-06 19:13:01 +02:00
Jan Tojnar
f9237f3152
Merge branch 'master' into staging-next
2019-09-06 16:55:11 +02:00
worldofpeace
3b39b03f05
Merge pull request #68144 from fgaz/fgaz/remove-qt-stdenv
...
Switch my qt packages to qt-specific mkDerivation
2019-09-06 05:19:39 -04:00
Markus Hauck
8e6b1cac31
imv: 3.1.2 -> 4.0.1
2019-09-06 10:05:32 +02:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
...
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
ed54a5b51d
Merge branch 'gtk-no-plus'
2019-09-06 02:57:51 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
...
GTK was renamed.
2019-09-06 02:54:53 +02:00
Francesco Gazzetta
c16df62034
drawpile: Switch to qt-specific mkDerivation
2019-09-05 17:22:57 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next
2019-09-04 11:00:56 +02:00
Will Dietz
9dbda3eddf
Merge pull request #66737 from dtzWill/feature/azpainter
...
azpainter: init at 2.1.4
2019-09-03 18:25:21 -05:00
Franz Pletz
de85797565
Merge remote-tracking branch 'origin/master' into gcc-8
2019-09-03 22:15:07 +02:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging
2019-09-02 23:25:24 +02:00
worldofpeace
2baa9e74c4
Merge pull request #67732 from lightbulbjim/freecad-wayland
...
freecad: fix missing app icon and name when running under Wayland
2019-09-02 01:17:20 -04:00
Fabian Möller
9334ce105a
nomacs: really use Qt mkDerivation
2019-09-01 17:35:00 +02:00
Fabian Möller
543b904873
nomacs: enable translations
2019-08-31 22:31:48 -04:00
Fabian Möller
fee74012f2
nomace: use Qt mkDerivation
2019-08-31 22:31:48 -04:00
Chris Rendle-Short
58cba198a4
freecad: fix missing app icon and name when running under Wayland
...
Has been upstreamed and should be safe to remove in versions >= 0.19
2019-08-31 20:43:51 +10:00
Frederik Rietdijk
ad1d58c622
Merge staging-next into staging
2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291
Merge master into staging-next
2019-08-31 09:50:38 +02:00
Fabian Möller
00ab4f8c80
mirage: fix build failure
2019-08-30 14:50:52 +02:00
dawidsowa
b047ec5173
kcc: init at 5.5.1
2019-08-29 02:23:31 +02:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
Robin Gloster
616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8
2019-08-25 18:55:46 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
...
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Jan Tojnar
a8d3aebdce
Merge pull request #67318 from jtojnar/gnome-photos
...
gnome-photos: 3.32.0 → 3.32.1
2019-08-23 19:49:43 +02:00
