Added Sphinx Search package
CUPS system wide client configuration.
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
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
Revert "Revert "Merge pull request #2449 from wkennington/master.grub""

This reverts commit 94205f5f21c4d9942bb4205c06229438051b6853.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
nixos/install-grub: Store path should be /nix/store not /nix
nixos/generate-config: Support detecting nested subvolumes
nixos/install-grub: Detect nested btrfs subvolumes
nixos/tests-installer: Add a test for btrfs default volumes and bind mounts
nixos/generate-config: Don't interpret btrfs subvols as bind mounts
nixos/installer-test: Use nested subvolumes for root to test detection
nixos/install-grub: Always copy kernels for different devices
nixos/install-grub: Only check for /nix to be the mountPoint for the store
nixos/generate-config: Only add store search path when kernels are not copied