nixpkgs/pkgs
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
..
applications svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
build-support svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
data * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 2012-01-18 20:53:01 +00:00
desktops svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
development svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
games svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
lib svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
misc svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
os-specific svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
servers svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
shells * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
stdenv svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
test
tools svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
top-level svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00