svn path=/nixpkgs/trunk/; revision=31367
svn path=/nixpkgs/trunk/; revision=31360
Cherry-pick from stdenv-updates svn path=/nixpkgs/trunk/; revision=31356