3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2479 commits

Author SHA1 Message Date
Frederik Rietdijk 731c82a447
Merge pull request #68244 from NixOS/staging-next
Staging next that includes gcc8
2019-09-09 08:09:36 +02: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
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
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
Jan Tojnar c6eb691fb8
gnome-photos: add installed tests 2019-08-23 19:31:14 +02:00
Marek Mahut 35940e50c5
Merge pull request #66781 from r-ryantm/auto-update/avocode
avocode: 3.9.0 -> 3.9.2
2019-08-23 09:51:40 +02:00
Marek Mahut 2d7a222970 avocode: adding at-spi2-core into rpath 2019-08-23 08:30:31 +02:00
Jan Tojnar c241e9756b
gnome-photos: move from gnome3 2019-08-23 02:59:33 +02:00
Marek Mahut 237642b2f5
Merge pull request #67126 from r-ryantm/auto-update/rapid-photo-downloader
rapid-photo-downloader: 0.9.15 -> 0.9.16
2019-08-21 08:43:38 +02:00
R. RyanTM b5c9e3f62e rapid-photo-downloader: 0.9.15 -> 0.9.16
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rapid-photo-downloader/versions
2019-08-20 14:39:41 -07:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Marek Mahut 03d34165bf
Merge pull request #67067 from prusnak/kodelife
kodelife: init at 0.8.3.93
2019-08-20 18:49:56 +02:00
Pavol Rusnak 8492dfeaba
kodelife: init at 0.8.3.93 2019-08-20 18:16:16 +02:00
Rickard Nilsson 225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
worldofpeace a012ea3ab5 ideogram: add hicolor-icon-theme 2019-08-19 20:59:35 -04:00
pacien 187f634953 gscan2pdf: 2.3.0 -> 2.5.5 2019-08-19 18:03:56 +09:00
Marek Mahut 9541c6b7bf
Merge pull request #66740 from lopsided98/processing-update
processing: 3.4 -> 3.5.3
2019-08-19 08:43:13 +02:00
WilliButz 066136034c
Merge pull request #65945 from r-ryantm/auto-update/imagemagick
imagemagick7: 7.0.8-53 -> 7.0.8-58
2019-08-18 23:43:46 +02:00
worldofpeace 5c430ff744
Merge pull request #64607 from gloaming/gimp-fix-plugins-exiv2
Fix build for gimp-with-plugins against exiv2 0.27.1
2019-08-18 17:21:36 -04:00
R. RyanTM 41f72597df avocode: 3.9.0 -> 3.9.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/avocode/versions
2019-08-17 11:51:12 -07:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Frederik Rietdijk c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
Ben Wolsieffer 939cd1bf4c processing: 3.4 -> 3.5.3 2019-08-16 22:22:03 -04:00
Will Dietz 63c28c839f
azpainter: init at 2.1.4 2019-08-16 19:29:23 -05:00