Merge pull request #1755 from lethalman/baobab

baobab: new package
duply: update 1.5.11 -> 1.6.0
Remove dvswitch: I don't use it, and it's broken
nvidia driver: fix eval with older kernels (e.g. 3.10)
nvidia driver: allow building on Hydra, maintain

The stuff is unfree, but distribution in any form *is* encouraged, c.f.
http://metadata.ftp-master.debian.org/changelogs//non-free/n/nvidia-graphics-drivers/nvidia-graphics-drivers_319.82-1_copyright
plantuml: update 7982 -> 7991
xorg.xkeyboard-config: commit forgotten fixups

Without these there was also a mysterious collision in nixos etc generation.
python26: unbreak build (revert from db5 to db44)

The bsddb module is apparently not compatible with db5 (or db48), so switch
back to db44. Fixes the following build error:

  $ nix-build -A python26.modules
  these derivations will be built:
    /nix/store/5zcqmpa4iby0aa342psjph0byiyikm6h-python-bsddb-2.6.8.drv
  building path(s) `/nix/store/qpsjyx7nmxhm9zq40674wr67dx8w6ycl-python-bsddb-2.6.8'
  building /nix/store/qpsjyx7nmxhm9zq40674wr67dx8w6ycl-python-bsddb-2.6.8
  unpacking sources
  unpacking source archive /nix/store/2qwc1kd8allnaljm1z360lv9jsf8cfqy-Python-2.6.8.tar.bz2
  source root is Python-2.6.8
  patching sources
  applying patch /nix/store/cfk04ans56xql9l6waqhqzzd60g9rzxi-search-path.patch
  patching file setup.py
  Hunk #1 succeeded at 424 (offset 145 lines).
  applying patch /nix/store/dxscwf37hgq0xafs54h0c8xx47vg6d5g-nix-store-mtime.patch
  patching file Python/import.c
  Hunk #1 succeeded at 747 (offset -4 lines).
  configuring
  building
  running build_ext
  INFO: Can't locate Tcl/Tk libs and/or headers
  Traceback (most recent call last):
    File "./setup.py", line 2037, in <module>
      main()
    File "./setup.py", line 2032, in main
      'Lib/smtpd.py']
    File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/core.py", line 152, in setup
      dist.run_commands()
    File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/dist.py", line 975, in run_commands
      self.run_command(cmd)
    File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/dist.py", line 995, in run_command
      cmd_obj.run()
    File "/nix/store/xxzwak31qql6vq7v35xmq68zmjpfr5py-python-2.6.8/lib/python2.6/distutils/command/build_ext.py", line 340, in run
      self.build_extensions()
    File "./setup.py", line 249, in build_extensions
      longest = max([len(e.name) for e in self.extensions])
  ValueError: max() arg is an empty sequence
  builder for `/nix/store/5zcqmpa4iby0aa342psjph0byiyikm6h-python-bsddb-2.6.8.drv' failed with exit code 1
  error: build of `/nix/store/5zcqmpa4iby0aa342psjph0byiyikm6h-python-bsddb-2.6.8.drv' failed
yelp-xsl: new package

Yelp's universal stylesheets for Mallard and DocBook.

https://wiki.gnome.org/Apps/Yelp
yelp: new package

Yelp is the help viewer in Gnome.

https://wiki.gnome.org/Apps/Yelp
Merge master into x-updates
python26: update dependency 'db44' to 'db47'

I downgraded too aggressively from db5 to db4. db48 doesn't work but
db47 does, so there is no need to downgrade further.
Merge pull request #1757 from lethalman/yelp

Yelp and yelp-xsl
Allow directly setting hashedPassword for root
feh: add jpeg image manipulation support
Merge pull request #1758 from offlinehacker/pkgs/feh/jpeg_manipulation

feh: add jpeg image manipulation support
kernel: 3.12.10 -> 3.12.11 (close #1743)
redshift: default to string type for option brightness
xulrunner: disable parallel builds (until fixed)

cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282
Merge pull request #1744 from ocharles/haskellPackages.aeson

haskellPackages.aeson_0_7: No longer depends on attoparsec 0.11