A minor fix to maintainers field for some packages (aegisub,mpv,8086tiny and bochs)
build-support: Add writeTextDir

This `writeTextFile` based helper function is especially usefull for writing a
bunch of configuration files to root of the output folder
Openbox: Added wrapping for XDG_DATA_DIRS

Fixes issue with Openbox failing to start due to not finding its default
theme
Merge remote-tracking branch 'upstream/master'
electrum: initial expression

Electrum is a Bitcoin thin-wallet.
https://electrum.org
Aspell dictionaries update: Portuguese (pt_PT) and Brazilian (pt_BR)
mplayer: add option config.mplayer.vdpauSupport
esniper: add patch to fix unrecognized e-bay log-in page
Merge pull request #2017 from wizeman/u/python-lzma

python-3.3, 3.4: Add support for lzma compression
Merge branch 'fix-openbox' of git://github.com/Shados/nixpkgs

Openbox: Added wrapping for XDG_DATA_DIRS
Merge branch 'electrum' of git://github.com/ehmry/nixpkgs

electrum: initial expression
Merge branch 'pkgs/build-support/writeTextDir' of git://github.com/offlinehacker/nixpkgs

build-support: Add writeTextDir
Merge branch 'master' of git://github.com/AndersonTorres/nixpkgs

Updating Portuguese and Brazilian language dictionaries for Aspell
Merge branch 'mplayer_vdpau' of git://github.com/matejc/nixpkgs

mplayer: add option config.mplayer.vdpauSupport
Fix tarball
conkeror: upgrade to more recent snapshot

needed for scripting Downloads.jsm with Gecko >= 26
unison: upgrade to 2.40.102
psmisc: the tarball got updated upstream

looking at our git history, I think it is very peculiar that we
managed to have this version (22.21) 2 months before release :)

So I think we were using some beta/rc that accidentally got called
22.21
libarchive: patch checksum failure

Probably github changed some headers in their patch output.
I verified other sources for CVE2013-0211 and the patch seems the
same.
Bringing back the xkeyboard-config eo patch