add the servant (haskell) packages to nixpkgs
use camelCase instead of dashes for servant package names in haskell-packages.nix
rename nix files to default.nix for all servant pkgs
zeitgeist: fix build
python3Packages: disable some
servant-scotty/default.nix: switch to version 0.1.1 which relaxes the bounds on the transformers package
fix a small typo
Merge pull request #3823 from aristidb/master

virtinst: fix name resolution ambiguity breaking the runnability
Merge branch 'add-haskell-servant' of git://github.com/alpmestan/nixpkgs

add the servant (haskell) packages to nixpkgs
linux/grsec: updates

3.15.10 is EOL soon, but grsecurity/unstable hasn't moved to 3.16.x yet.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
nixos: Use literalExample for systemPackages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
nixos/manual: Use literalExample when feasible.

Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.

Thanks to @devhell for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
cantata: update to 1.4.1
Merge pull request #3824 from Fuuzetsu/cantata

cantata: update to 1.4.1
Containers: Use nsenter to execute commands in containers

Also remove ‘nixos-container set-root-password’, which is kind of
pointless now.
nixos-container run: Execute command using ‘su’

This ensures that the environment is set up correctly.
ats2: bump
Update haskellPackages.engineIo and haskellPackages.socketIo
haskellPackages.engineIo: Update to 1.1.2
licenses: Add CC0 license.

A universal public domain license.

http://creativecommons.org/publicdomain/zero/1.0/