add bash-4.2 patches 25 through 39
Merge remote-tracking branch 'upstream/master' into bash.121120
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Applied to wrong branch.
Revert "add bash-4.2 patches 25 through 39"

This reverts commit b6c5b9806f6ae79652336a7cfb51fe0f03d0590a.
Merge https://github.com/jcumming/nixpkgs into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
vlada/ipe

Adding the ipe editor.

Signed-off-by: Vladimír Čunát <vcunat@gmail.com>
update atop
bup: optionally depend on par2cmdline

The default is to use it from path when available, as this is an
optional feature.
SBCL: Update to 1.1.3
Wine: Update to 1.5.21
nzbget: Update to 9.0
samba, imagemagick: Add missing meta info
haskell-hashable: update (unused) 1.2.x version to 1.2.0.3
haskell-nats: add version 0.1
haskell-transformers-compat: add version 0.1
wxHaskell: patch wxc to fix build error
Jailbreak Haskell packages to deal with update of semigroups.
haskell-comonad-transformers: update to version 3.0.1