svn path=/nixpkgs/branches/stdenv-updates/; revision=25078
svn path=/nixpkgs/trunk/; revision=22221
Contributed by Brian Gough <bjg@gnu.org>. svn path=/nixpkgs/trunk/; revision=21284