svn path=/nixpkgs/trunk/; revision=22014
svn path=/nixpkgs/branches/xorg-7.5/; revision=18055
svn path=/nixpkgs/branches/stdenv-updates/; revision=15206