svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823
svn path=/nixpkgs/trunk/; revision=7894