Add opam 0.9.5
Delete 0.9.4
Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me
Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs

This branch refactors xfce and updates it to 4.10. I had been hoping to
find someone besides Vlada to test this (I don't use xfce), but no one
has come forward yet in 2 weeks so if this breaks something they can
make an issue or fix it. It all looks good by inspection.
Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs

This adds the opam ocaml package, and also adds orbitz as a maintainer.
I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
ocamlPackages.opam: Fix indentation

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs

This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.

I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs

This branch adds libcap-ng and updates SELinux. It doesn't seem like
anyone is actually using SELinux from nixpkgs, but everything compiles
and looks right.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs

The original fix modified a generated file instead of the
manually-maintained overrides file. Checked by inspection.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs

Attempts to fix recode build on darwin, verified by inspection (don't
have a readily available darwin machine for testing right now, will let
hydra see if this worked).

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'master' of git://github.com/fignuts/nixpkgs

This updates mysql-workbench. Didn't compile before, compiles now.

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

This branch updates pygobject (the diff itself is trivial), which
affects a lot of packages but due to the recent stdenv merge this seems
like a good time for this.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'xchainkeys' of git://github.com/iyzsong/nixpkgs

This adds a new package, xchainkeys. It builds, so I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'tor.130308' of git://github.com/jcumming/nixpkgs

This commit ensures tor is linked to lgcc_s. Tests didn't pass before,
pass now.

Signed-off-by: Shea Levy <shea@shealevy.com>
tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do
tor: minor cleanups

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'perl.130308' of git://github.com/jcumming/nixpkgs

Trivial update to XML-LibXML perlPackage

Signed-off-by: Shea Levy <shea@shealevy.com>
man-pages: Update to 3.48
Exporting XFCE gvfs: it is referenced in NixOS, it is unclear how to remove the dependency cleanly and it affects rebuild even with config that doesn't mention XFCE at all.
zbar requires v4l1; disabe video