typo2
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
  typo2
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  typo2
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

# By Peter Simons (581) and others
# Via Marc Weber (189) and others
* refs/remotes/gh/top-bases/experimental/marc: (1312 commits)
  fix
  New TopGit dependency: experimental/multiple-versions-in-one-file
  try unstable patch
  add ruby tagging (previously this was present in experimental/updates)
  fix typo
  New TopGit dependency: experimental/overlays
  haskell-lens: update to version 3.8.2
  haskell-diagrams-contrib: update to version 0.6.0.2
  haskell-cpphs: update to version 1.16
  haskell-hlint: update to version 1.8.42
  haskell-cabal2nix: update to version 1.43
  haskell-BNFC: update to version 2.6.0.3
  haskell-zlib-bindings: update to version 0.1.1.3
  haskell-pandoc: update to version 1.10.0.5
  haskell-logict: update to version 0.6
  haskell-hakyll: update to version 4.1.2.1
  haskell-digestive-functors: update to version 0.6.0.0
  haskell-digestive-functors-snap: update to version 0.6.0.0
  haskell-digestive-functors-heist: update to version 0.6.0.0
  haskell-citeproc-hs: update to version 0.3.7
  ...
Merge commit 'd30cb2bba3b9c468f2d739f1f2809a97c068f499' into experimental/php

# By Peter Simons (581) and others
# Via Florian Friesdorf (17) and others
* commit 'd30cb2bba3b9c468f2d739f1f2809a97c068f499': (1297 commits)
  haskell-lens: update to version 3.8.2
  haskell-diagrams-contrib: update to version 0.6.0.2
  haskell-cpphs: update to version 1.16
  haskell-hlint: update to version 1.8.42
  haskell-cabal2nix: update to version 1.43
  haskell-BNFC: update to version 2.6.0.3
  haskell-zlib-bindings: update to version 0.1.1.3
  haskell-pandoc: update to version 1.10.0.5
  haskell-logict: update to version 0.6
  haskell-hakyll: update to version 4.1.2.1
  haskell-digestive-functors: update to version 0.6.0.0
  haskell-digestive-functors-snap: update to version 0.6.0.0
  haskell-digestive-functors-heist: update to version 0.6.0.0
  haskell-citeproc-hs: update to version 0.3.7
  haskell-ansi-wl-pprint: update to version 0.6.6
  haskell-ansi-terminal: update to version 0.6
  haskell-idris: update to version 0.9.6
  haskell-mpppc: jailbreak to support recent versions of ansi-terminal
  haskell-hspec: jailbreak to support recent versions of ansi-terminal
  haskell-reflection: add version 1.1.6
  ...
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (51 commits)
  haxe-latest
  New TopGit dependency: experimental/ruby
  fix sort in lists.nix
  merge failure
  source of gupnp-igd is gone, too, use ubuntu source (launchpad) - same hash
  New TopGit dependency: experimental/eclipse
  2.6-2 moved to 2.6-3, so patches were not found
  libreoffice startup hack
  fix merge failure (hash)
  for eclipse use older cairo. With newer cairo Eclipse crashes after selecting a workspace
  Revert "cairo: Update to 1.12.4"
  New TopGit dependency: experimental/parallel-building
  reset jdk stuff to master. Don't know why it was different at all
  adding csound
  sox: parallelbuilding, flac, ogg support
  parallel building for sane
  Revert "openjdk: Don't use the official build system's boostrapping, do our own."
  fix merge errors haxe2
  making ati dirvers compile again
  New TopGit dependency: experimental/xsbt
  ...
Merge commit 'a7e8f938dbd9976b8247e1a2da8ce52709b4cf52' into experimental/marc

* commit 'a7e8f938dbd9976b8247e1a2da8ce52709b4cf52': (1315 commits)
  fix
  New TopGit dependency: experimental/multiple-versions-in-one-file
  try unstable patch
  add ruby tagging (previously this was present in experimental/updates)
  fix typo
  New TopGit dependency: experimental/overlays
  haskell-lens: update to version 3.8.2
  haskell-diagrams-contrib: update to version 0.6.0.2
  haskell-cpphs: update to version 1.16
  haskell-hlint: update to version 1.8.42
  haskell-cabal2nix: update to version 1.43
  haskell-BNFC: update to version 2.6.0.3
  haskell-zlib-bindings: update to version 0.1.1.3
  haskell-pandoc: update to version 1.10.0.5
  haskell-logict: update to version 0.6
  haskell-hakyll: update to version 4.1.2.1
  haskell-digestive-functors: update to version 0.6.0.0
  haskell-digestive-functors-snap: update to version 0.6.0.0
  haskell-digestive-functors-heist: update to version 0.6.0.0
  haskell-citeproc-hs: update to version 0.3.7
  ...
update ati, make compile with 3.7 (gentoo patches)
Merge branch 'fixes/ati-proprietary' into experimental/marc

* fixes/ati-proprietary:
  update ati, make compile with 3.7 (gentoo patches)

Conflicts:
	pkgs/os-specific/linux/ati-drivers/default.nix