nixos/nixpkgs merge

Signed-off-by: Shea Levy <shea@shealevy.com>