Merge branch 'master' into staging

* master:
  libretro.mame: fix parallel building
  gnome3: add jtojnar as maintainer
  libskk: fix build
  gencfsm: fix build
  wkhtmltopdf: fix build
  gutenprint: fix build
  ghc-8.2.2: drop obsolete gold linker patch
  git-annex: update hash for new version 6.20171124
  hackage-packages.nix: automatic Haskell package set update
  hackage2nix: disable failing builds
  hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hack
  brotli: 0.6.0 -> 1.0.1
  brotliUnstable: delete
  libbrotli: delete
  libbrotli: 1.0 -> 1.0.1.2017-10-30
  nginxModules.brotli: 2015-11-18 -> 2016-12-02