Update ProofGeneral to version 4.2
gparted: update
Partially revert my recent kernelPackages changes

First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
Add the addPassthru library function

With multiple outputs, adding attributes to a derivation without
changing the {drv,out}Path is no longer as trivial as simply using the
`//' operator, as we usually want to add the attribute to _each_ output,
and even if we only care about one that one output can be reached via
multiple paths.

For stdenv.mkDerivation, we already had code in place to add passthru
and meta attributes to derivations. This commit simply factors part of
that code out into a lib function addPassthru, which takes a derivation
and an attribute set and appends the attribute set to each output of the
derivation.

Signed-off-by: Shea Levy <shea@shealevy.com>
get iptraf to compile
haskell-editline: add myself as maintainer
haskell-attoparsec-conduit: update to version 1.0.1
haskell-blaze-builder: update to version 0.3.1.1
haskell-conduit: update to version 1.0.4.1
haskell-diagrams-contrib: update to version 0.6.1
haskell-hamlet: update to version 1.1.7
haskell-wai-extra: update to version 1.3.3.2
haskell-arithmoi: add version 0.4.0.3
haskell-circle-packing: add version 0.1.0.2
pkgs/lib/licenses.nix: add 'unfree' and 'unfree-redistributable' licenses
pkgs/lib/licenses.nix: strip trailing whitespace
nvidia-x11: use the brand-new 'unfree-redistributable' license for this package
gnulib: add version 0.0-7898-gdb9cad7
ProofGeneral: remove dead code (compatibility with emacs 23).
htop: update to version 1.0.2