Sync with latest Nix

Created by  Eelco Dolstra  on July 17, 2017
PW4TLMWSMKGTN4UKRNQD3H2PWLTXOPSXDZXUVVFQSQS6AFBQLDDAC
Change contents