Merge master into staging

This commit is contained in:
Frederik Rietdijk
2018-07-22 11:14:41 +02:00
2379 changed files with 66329 additions and 36190 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge