Added Sphinx Search package
Google hangouts: Bump to 5.4.2.0

Verified working with Firefox, however it still doesn't work with
Chromium because of the NPAPI vs PPAPI thing.

Chrome's Pepper Plugin API doesn't seem to look for
plugins in the MOZ_PLUGIN_PATH, anyway I left them there for others to
find the solution :-)
CUPS system wide client configuration.
Adds ocaml-sqlite3EZ and its dependency ocaml+twt

ocaml+twt is an alternative syntax for OCaml that uses indentation to group
multi-line expressions, like Python and Haskell.

Homepage: http://people.csail.mit.edu/mikelin/ocaml+twt/

sqlite3EZ is a thin wrapper for sqlite3-ocaml with a simplified interface. Query
results are processed with a functional map/fold, transactions are
aborted by exceptions, resource management is handled by the garbage
collector, etc.

Homepage: https://github.com/mlin/ocaml-sqlite3EZ
Install runtime executables for k3b.
qt: make package names of "full" variants appear as such

Currently there is no distinction in the package names of Qt packages
whether they are "full" or not (i.e. coming from a qt5Full or qt5
attribute).

Currently:
  $ nix-env -f. -qaP | grep "^qt[45]"
  qt48Full   qt-4.8.6
  qt5Full    qt-5.2.1
  qt5        qt-5.2.1
  qt53       qt-5.3.1
  qt53Full   qt-5.3.1
  [...]

With this change:
  $ nix-env -f. -qaP | grep "^qt[45]"
  qt5        qt-5.2.1
  qt53       qt-5.3.1
  qt48Full   qt-full-4.8.6
  qt5Full    qt-full-5.2.1
  qt53Full   qt-full-5.3.1
  [...]
Xiphos - New Package (version 3.2.1)

This is a new expression for Xiphos 3.2.1,
followed by an update of Sword library to 1.7.3 (required)
Updated definition file as per comments from the collaborator
Merge branch 'master' into add-sphinx-search
unbound: run in chroot
fcitx: update to 4.2.8.4
add fcitx-anthy
gpodder: Update to 3.8.0
nixos/network-interfaces: Allow explicit virtual interface type setting
nixos/network-interface: Append -netdev for all device units

Currently, device units are named directly after the name the user
specifies for the device. A bridge device named lan will be defined
within lan.service. This becomes a problem if you want your interface
named nginx but also want to run the nginx service.

This patch fixes the issue by appending netdev to all virtually created
network device units. Therefore, the lan bridge -> lan-netdev.service.
This naming convention is used for all types of network devices in order
to ensure that all network devices are unique.
nixos/network-interfaces: Fix vlan device coming up during switch
Merge remote-tracking branch 'upstream/master' into ocaml-sqlite3EZ

Conflicts:
	pkgs/top-level/all-packages.nix
tinc_pre: Add derivation

The tinc developer has made significant developments to the next version
of tinc including many protocol security fixes. This patch adds the
prerelease of the next major tinc release.
tinc_pre: Experimental Patches
nixos/install-grub: Fix typo