nixos: disable ntp on containers by default
Merge pull request #2199 from offlinehacker/nixos/ntp/containers_fix

nixos: disable ntp on containers by default
Merge pull request #2197 from offlinehacker/pkgs/lxc/rootfs_fix

lxc: set rootfs path somewhere outside /nix/store
Merge pull request #2198 from offlinehacker/nixos/shadow/login_containers_fix

nixos: fix shell on conatiners
Merge pull request #2195 from linquize/git-1.9.2

git: Update to 1.9.2
Add logstash-forwarder.
openldap: Update from 2.4.38 to 2.4.39
Fix permissions on /var/lib/startup-done
Bring back ‘nixos-container update’
nixos-container: Add ‘run’ and ‘root-login’ commands

And remove ‘root-shell’.
Add option networking.nat.internalInterfaces

This allows applying NAT to an interface, rather than an IP range.
Document NixOS containers
Merge branch 'containers'

Fixes #2105.
libtxc_dxtn_s2tc: add v1.0 (close #2194)

S2TC is a patent-free S3TC compatible implementation and provides texture
compression to mesa.
pango on darwin: attempt to fix build

Supply older flex (new doesn't build), and disable introspection.
postgresql93: fix darwin builds

ossp-uuid does not build on darwin
llvm(Packages) on darwin: attempts to fix

- mark llvm34 as broken on darwin (so it doesn't install by default with nix-env)
- don't use our gcc for llvm_34 (might fix the build)
- switch also clang default to 3.3 on darwin (llvm was before)
New derivation: language-c-inline (haskell)
Adding TCPFlow: a tool to separate tcp streams when capturing
haskell-HTF: update to version 0.11.3.4