nixpkgs/pkgs
Yury G. Kudryashov b8fafa21e6 Merge commit 'trunk'
Conflicts:

	pkgs/development/compilers/ocaml/default.nix
	pkgs/development/interpreters/python/default.nix
	pkgs/tools/package-management/nix/unstable.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=9762
2007-11-19 22:43:29 +00:00
..
applications Mercurial upgrade 2007-11-17 14:04:54 +00:00
build-support Merged with trunk. 2007-11-16 21:05:15 +00:00
configs/etc d'oh, don't actually gzip it 2006-03-08 19:25:44 +00:00
data Added poppler and poppler-data 2007-11-11 16:00:51 +00:00
desktops Merged with trunk. 2007-11-16 21:05:15 +00:00
development * Updated various stdenv packages (grep, gawk, tar, cpio, findutils, 2007-11-19 17:39:19 +00:00
games Fixed log nesting; added Qi. 2007-11-08 14:34:54 +00:00
lib Rewritten gettext-version stuff. 2007-11-17 14:05:55 +00:00
misc Merge commit 'trunk' 2007-11-19 22:43:29 +00:00
os-specific/linux Merge commit 'trunk' 2007-11-19 22:43:29 +00:00
servers xorg: deault.nix and generate-expr-from-tarballs.pl synced 2007-11-19 22:29:08 +00:00
shells * Fix a bunch of URLs. 2007-09-11 10:15:07 +00:00
stdenv Removed setup-new-2.sh and setup-new.sh symlinks 2007-11-17 15:29:48 +00:00
test Merged with trunk. 2007-11-16 21:05:15 +00:00
tools Merge commit 'trunk' 2007-11-19 22:43:29 +00:00
top-level Merge commit 'trunk' 2007-11-19 22:43:29 +00:00