nixpkgs/pkgs
Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
..
applications svn merge ^/nixpkgs/trunk 2012-02-23 20:06:21 +00:00
build-support svn merge ^/nixpkgs/trunk 2012-02-20 05:30:06 +00:00
data svn merge ^/nixpkgs/trunk 2012-02-19 11:16:24 +00:00
desktops kdelibs depend on xz. Really. 2012-02-19 11:19:11 +00:00
development svn merge ^/nixpkgs/trunk 2012-02-23 20:06:21 +00:00
games * Sync with the trunk. 2012-02-21 23:29:21 +00:00
lib
misc svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
os-specific svn merge ^/nixpkgs/trunk 2012-02-23 20:06:21 +00:00
servers svn merge ^/nixpkgs/trunk 2012-02-23 20:06:21 +00:00
shells
stdenv Honor propagatedUserEnvPackages in setup.sh 2012-02-17 21:37:15 +00:00
test
tools svn merge ^/nixpkgs/trunk 2012-02-23 20:06:21 +00:00
top-level svn merge ^/nixpkgs/trunk 2012-02-23 20:06:21 +00:00