Wrap k3b with PATH to required tools
rippled: initial pkg and module expressions

rippled is the Ripple P2P payment network reference server
https://ripple.com
added mtpfs to mount MTP devices via usb using FUSE
rippled: added comment on commented out config options
nixos: murmur service

Murmur is the headless server component of the Mumble chat system.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
nixos: add mumble test

This tests that both the client and server work. With screenshots!

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Update ffmpeg dependency in oraclejdk7
ssh: Don't set xauth if not running xserver
calibre: upgrade from 1.25.0 to 1.31.0
Make cpufrequtils compilation pure.
virt-manager: update to 1.0.1, fix & update dependencies, gtk3 support

- Vte, add gtk3 support, enable introspection, update to 0.35.90
- Spice-gtk, add gtk3 support
- gtk-vnc, add gtk3 support
- Add libvirt-glib (thanks @bjornfor)
- Add usbredir
- qemu, enable usbredir
- spice-gtk, enable usbredir
- virt-manager, update to 1.0.1

[Bjørn:
* Set namePrefix = "" to preserve package name "virt-manager"
  (instead of "python2.7-virt-manager")
* Add dconf to GIO_EXTRA_MODULES to get persistent settings in
  virt-manager. Without it:
  GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.
* Add ${gtk3}/share to XDG_DATA_DIRS to unbreak "Take Screenshot"
  feature (fixes "Settings schema 'org.gtk.Settings.FileChooser' is not installed")
* gtk-vnc: don't pull "pkgs" attrset for optionalString, use stdenv.lib.optionalString instead.
]
Merge branch 'rippled' of git://github.com/ehmry/nixpkgs

rippled: initial pkg and module expressions

Had to change the rippled uid.

Conflicts:
	nixos/modules/misc/ids.nix
Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs

Wrap k3b with PATH to required tools
Revert "Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs"

It turns out this doesn't work due to setuid issues. I had been under
the impression that it was partially broken, but it is in fact totally
broken.

This reverts commit 718466074fa03de4dc1ab0d333fb43d8bbed2c8f, reversing
changes made to ea9c8d6a131502009ec583f1c7f785b511c36b8c.
libresample: Add package
Merge branch 'mtpfs' of git://github.com/qknight/nixpkgs

added mtpfs to mount MTP devices via usb using FUSE
Remove superfluous newline
Merge branch 'murmur' of git://github.com/thoughtpolice/nixpkgs

nixos: add Murmur module (Mumble chat)

Conflicts:
	nixos/modules/misc/ids.nix
Merge branch 'oraclejdk' of git://github.com/nilcons/nixpkgs

Update ffmpeg dependency to 0.10 in oraclejdk7
Merge branch 'master.xauth' of git://github.com/wkennington/nixpkgs

ssh: Don't set xuth if not running xserver