nixpkgs/pkgs/tools/package-management/disnix/disnixos
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
..
default.nix svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00