ati update - not that much testing done, but it runs and compiles with 3.10.5
Merge commit '9d438b7e06ac946c72f43dc5daca8b842c379e3f' into experimental/marc

* commit '9d438b7e06ac946c72f43dc5daca8b842c379e3f': (185 commits)
  fix, why did this appear here?
  ati update - not that much testing done, but it runs and compiles with 3.10.5
  windowmaker: New package in version 0.95.4.
  paramiko: Correctly call the test suite.
  uqm: Update video extractor to latest Git version.
  picard: Patch in path of AcoustED fingerprinter.
  acoustid-fingerprinter: Add new package, v0.6.
  chromaprint: Add new package in version 0.7.
  chromium: Update beta and dev channels.
  redshift: Update to new upstream version 1.7.
  picard: Update to new upstream version 1.2.
  chromium: Drop cups_allow_deprecated.patch.
  ipython: 0.13.2 -> 1.0.0
  haskell-yesod: update to version 1.2.2
  haskell-yesod-test: update to version 1.2.1
  haskell-yesod-form: update to version 1.3.1
  haskell-yesod-core: update to version 1.2.4
  haskell-yesod-bin: update to version 1.2.2.1
  haskell-yesod-auth: update to version 1.2.1
  haskell-yaml: update to version 0.8.4.1
  ...
Merge commit 'b35c77b9870dd5e3173e70747fe8c98e1fef47a8' into experimental/marc

* commit 'b35c77b9870dd5e3173e70747fe8c98e1fef47a8':
  merge problem fix
  adding store-backup
Merge commit '4497eecde107defe5e9b540334d1becdaf63423b' into experimental/marc

* commit '4497eecde107defe5e9b540334d1becdaf63423b':
  backup tools bup, storeBackup: implement sanity check
  backup tools bup, storeBackup: implement sanity check
Merge commit 'c9327f8342093cbd5d37106fba84a46e2c204c01' into experimental/marc

* commit 'c9327f8342093cbd5d37106fba84a46e2c204c01': (294 commits)
  git version of ffmpeg
  updating php
  libreoffice: more configure phase dependencies
  libreoffice: add missing deps
  libreoffice: fix eval
  backup tools bup, storeBackup: implement sanity check
  libreoffice: 3.6.6.2 -> 4.0.5.2
  adding store-backup
  firebirdSuper settings
  Add mirror url for AMD microcode
  add travis ruby gem
  Add final haskell library
  basex: new package
  linux-3.10: upgrade to 3.10.10
  firefox: upgrade to 23.0.1
  uncrustify: new package
  haskell: export callPackage to be able to create packages outside haskell-packages.nix
  dstat: enable color output
  Fix peerDependency handling in buildNodePackage
  haskell-hsemail: update to version 1.7.7
  ...
Merge commit '8ec226b476936404a84d9d7bc484221c58a771e8' into experimental/marc

* commit '8ec226b476936404a84d9d7bc484221c58a771e8':
  deactivating patches for now
  New TopGit dependency: experimental/fonts
  adding fonts dictionary
  new tg branch experimental/fonts
  use .x - never forgett to update those numbers again
Merge commit 'db2919c993b0e052eb8a32c7fbddb312a4157e9b' into experimental/marc

* commit 'db2919c993b0e052eb8a32c7fbddb312a4157e9b':
  use true_version, change url
Merge commit '0ea3365369fa6efc6a3cbde339ae366ff653d959' into experimental/marc

* commit '0ea3365369fa6efc6a3cbde339ae366ff653d959': (94 commits)
  default to 0.10 version
  default to ffmpeg 0.10
  ledger3: Don't run tests on Darwin (they fail).
  cogl: fix build on darwin (close #924)
  Update nixUnstable
  texliveAggregationFunction: fix eval
  asymptote: fix build on darwin
  libusb1: fix build on darwin via dropping udev (close #920)
  texLive: fix build on darwin
  Added abook 0.6.0pre2
  chromium: Update all channels to latest versions.
  bacula: fix build on darwin
  perlPackages.ack: fix build on darwin
  lttng: 2.2.x -> 2.3.0
  GNU Stow: package - Symlink manager which makes it easy to manage dotfiles
  linux: Update to 3.4.60
  Removed obsolete patchelf instruction that was commented out
  Add patch to fix GET Bucket requests to fake-s3
  libX11 is not in vice's rpath. this fixes it
  gsoap: 2.7.15 -> 2.8.16
  ...