Add Printrun.
nvidia-x11: Fix build with kernel 3.13.
cb0cat is now cb1cat

Submissions for CAESAR are now over, so CBEAMr0 has become CBEAMr1 with
some minor alterations.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
ssdeep: Fix darwin build

Signed-off-by: Austin Seipp <aseipp@pobox.com>
mps: broken on Darwin unfortunately

Signed-off-by: Austin Seipp <aseipp@pobox.com>
fsharp: fix missing --replace argument

This should fix the Hydra build.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Merge branch 'ssdeep' of git://github.com/thoughtpolice/nixpkgs

ssdeep: Fix darwin build
Merge branch 'cb1cat' of git://github.com/thoughtpolice/nixpkgs

cb0cat is now cb1cat
Merge branch 'nvidia-fix' of git://github.com/ambrop72/nixpkgs

nvidia-x11: Fix build with kernel 3.13
Merge branch 'printrun' of git://github.com/ambrop72/nixpkgs

Add Printrun.
New package: wal-e

A Postgres WAL-shipping disaster recovery and replication toolkit
Merge branch 'mps-fix' of git://github.com/thoughtpolice/nixpkgs

mps: broken on Darwin unfortunately
haskell: import git-date 0.2.1
haskell: import persistent-mysql 1.3.0.2
buildLocalCabal: do not set LANG/LOCALE_ARCHIVE on non-linux machines
added mtpfs to mount MTP devices via usb using FUSE
xmonad: fix build with ghc 7.8.1
Another attempt to fix the installer test

http://hydra.nixos.org/build/9904133
Revert "slim: remove duplicate code"

This reverts commit f7d5e83abbe95ed06aac58f4d1a2e971fae4d186.  It
breaks the Firefox and Xfce tests:

  in job ‘tests.firefox.x86_64-linux’:
  cannot coerce a boolean to a string

  in job ‘tests.xfce.x86_64-linux’:
  infinite recursion encountered
nixos-hardware-scan: Detect QEMU