Merge commit 'refs/pull/53622/head' of https://github.com/NixOS/nixpkgs into staging
Alyssa Ross 7 years ago 2183d316 442a74bd