rename new cups to cuspd_1_7 so that old implementation can be kept
fix
fix
fix
fix
Merge commit '7e830f676bec8ae896954c1a9c13edef32b3c10c' into experimental/cups-1.6-and-1.7

* commit '7e830f676bec8ae896954c1a9c13edef32b3c10c': (2144 commits)
  build gutenprint cvs with gimp-2.8
  Remove ignored argument to sync
  Add a regression test for udisks
  Apply patch for CVE-2014-0004 to udisks-1.0.4
  Revert "udisks1: bump to fix CVE-2014-0004"
  Gnome 3 should not be a release blocker
  haskell-criterion: downgrade to hastache 0.5.1 to fix the build
  Added a derivation for Ozgun's's retry (Haskell.)
  buildPythonPackage: don't return on shellHook
  haskell-http-client-conduit: there is no code in this module to generate documentation for
  haskell-zlib-conduit: there is no code in this module to generate documentation for
  haskell-network-conduit: there is no code in this module to generate documentation for
  haskell-attoparsec-conduit: there is no code in this module to generate documentation for
  Upgrade hashable to version 1.2.x.
  haskell-blaze-builder-conduit: there is no code in this module to generate documentation for
  haskell-intervals: update to version 0.7
  haskell-exceptions: update to version 0.5
  haskell-zlib-conduit: update to version 1.1.0
  haskell-thyme: update to version 0.3.2.0
  haskell-tagstream-conduit: update to version 0.5.5.1
  ...
Merge commit 'a7c6f07d525416b9efb1fef43497a7f40d49e31a' into experimental/cups-1.6-and-1.7

* commit 'a7c6f07d525416b9efb1fef43497a7f40d49e31a': (317 commits)
  munin: 2.0.19 -> 2.0.20
  luajit: adopt, upgrade, optimize
  libseccomp: version 2.1.1
  lockdep: refactor into non-kernel package
  Revert "Turn on user-controlled wpa-cli on the livecd"
  Die tabs die
  Add a flag ‘config.allowBroken’
  Replace $HYDRA_DISALLOW_UNFREE with $NIXPKGS_ALLOW_UNFREE
  Disable allowUnfree by default
  stunnel: adopt, bump to version 5.01
  gst-plugins-bad: disable faac by default because it's unfree
  haskell-twitter-types: update to version 0.2.20140407
  haskell-twitter-conduit: update to version 0.0.2.1
  haskell-tasty: update to version 0.8.0.4
  haskell-http-client-multipart: update to version 0.3.0.0
  haskell-hakyll: update to version 4.5.1.0
  haskell-ghc-mod: update to version 4.0.2
  haskell-dyre: update to version 0.8.12
  haskell-Chart: update to version 1.2.2
  haskell-Chart-gtk: update to version 1.2.2
  ...