Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory ... renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661		2009-11-26 21:46:08 +00:00
..
generic	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
linux	- Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining	2009-11-19 19:03:34 +00:00
mingw	ln issue mingw	2009-11-16 12:22:55 +00:00
native	add support for x86_64-darwin	2009-11-26 15:45:31 +00:00
nix	Trying to fix the stdenv used on i686-darwin, which stopped working after my	2009-11-20 16:56:11 +00:00
adapters.nix	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
common-path.nix	* Make the nested output patch in GNU Make runtime configurable (by	2009-01-19 18:49:58 +00:00
default.nix	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00