Don't break compatibility with pre-1.6 nix

Signed-off-by: Shea Levy <shea@shealevy.com>
environment.promptInit is now programs.<shell>.promptInit

Signed-off-by: Shea Levy <shea@shealevy.com>
nvidia-x11: Put nvidia.icd in /etc/OpenCL/vendors

This makes OpenCL work with Nvidia cards (tested with darktable).
Fix bashrc regression

Interactive non-login shells should not source /etc/profile, otherwise
environment variables set by the user will get clobbered.  For
example:

  $ export PERL5LIB=/foo
  $ bash
  $ echo $PERL5LIB
  /home/eelco/.nix-profile/lib/perl5/site_perl:/nix/var/nix/profiles/default/lib/perl5/site_perl:/run/current-system/sw/lib/perl5/site_perl:/home/eelco/.nix-profile/lib/perl5/site_perl:/nix/var/nix/profiles/default/lib/perl5/site_perl:/run/current-system/sw/lib/perl5/site_perl
Fix duplicated environment values

All profileVariables listed each profile twice (e.g. $PATH contained
$HOME/.nix-profile/bin twice).  This is because mergeAttrsWithFunc is
broken (and deprecated):

  nix-repl> :p mergeAttrsWithFunc concat { x = [1]; } { y = [2]; }
  { x = [ 1 ]; y = [ 2 2 ]; }

So use zipAttrsWith instead.
Remove the portmap module

It's obsoleted by rpcbind.
Remove services.ttyBackgrounds

This hasn't worked in a long time.
Add a test for CUPS
cupsd: Log to syslog (and thus the journal)
cupsd: Use Type=forking

http://hydra.nixos.org/build/6291101
bash: fix broken completion
enableSplashScreen is no longer a valid option

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge remote-tracking branch 'official/master'