Merge pull request #3241 from ehmry/cjdns

cjdns declarative configuration
Merge pull request #3911 from vlstill/nfs-port_pullreq

nfsd: Make it possible to fix rpc.{mountd,statd,lockd} ports.
Merge pull request #3925 from proger/sysdig-no-kernel-dev

sysdig: cheat nix into not capturing linux-dev as a runtime dependency
Merge pull request #3905 from AndersonTorres/stella

Stella 4.0: New Package
sshd: Allow to specify ListenAddress.
sshd: Add note about firewall and listenAddresses.
sshd: Add note about listening on port 22 to listenAddresses.
Remove unneeded definitions
Merge pull request #3902 from DamienCassou/backintime

backintime: Definition improvement
Merge pull request #2644 from lethalman/pam_tally

pam: Add logFailures option for adding pam_tally to su
Merge pull request #3876 from wkennington/master.btrfsProgs

btrfsProgs: 3.14.2 -> 3.16.0
Merge pull request #3779 from offlinehacker/docker

full nixos inside docker
urlwatch: add version 1.16
python-wrapper: fix wrapped argv[0] w/o sed, maybe
Make console-getty only used inside container by default
Create wrapper directory outside of /bin/ for FHS chroots to be closer to FHS
add openvswitch package + basic nixos module to enable it
formatting/retab
Ensure libvirtd is started after vswitch and add ability to configure how libvirtd guests are shutdown
Merge pull request #3496 from auntieNeo/gmock

Added gmock (Google Mock) package to complement gtest package.