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
..
buildenv	revrting my accident only keeping rubygem updates and ruby libs	2009-06-30 15:58:02 +00:00
builder-defs	* Remove some more unused functions.	2009-11-17 15:31:48 +00:00
checker	removed all __primops from nixpkgs	2009-05-24 10:57:46 +00:00
deb-package	big breaking change: renaming lib.getAttr to lib.attrByPath	2009-05-24 10:57:41 +00:00
fetchbzr
fetchcvs
fetchdarcs	Added Idris and updated fetchdarcs.	2009-05-13 19:02:23 +00:00
fetchfile
fetchgit	echo to stderr in stead of stdout. else hydra cannot read hash/path	2009-11-18 19:10:24 +00:00
fetchhg	* Add a fetchhg builder to checkout mercurial repositories.	2009-11-14 20:14:21 +00:00
fetchmtn	Reduce fetchmtn verbosity	2009-11-08 22:30:38 +00:00
fetchsvn	Change fetchsvn as well as nix-prefect-svn to use the repository name and	2009-10-06 13:36:52 +00:00
fetchsvnssh
fetchurl	fetchurl: Improve GNU mirror list.	2009-11-18 13:18:28 +00:00
gcc-cross-wrapper	Improving the crossStripping. A cross-glibc gets broken if stripped by the	2009-11-23 17:06:57 +00:00
gcc-upc-wrapper
gcc-wrapper	Fixing the coreutils reference in the gcc-wrapper - they did not get properly	2009-11-22 18:39:27 +00:00
kernel	Making the 'makeInitrd' expression use "platform"	2009-11-08 18:47:55 +00:00
make-desktopitem	Added desktop file generation function and desktop item for firefox	2009-05-10 12:03:53 +00:00
make-symlinks
make-wrapper	* Firefox wrapper: put gecko-mediaplayer and mplayer at the start of	2009-07-16 11:22:37 +00:00
mono-dll-fixer
native-darwin-cctools-wrapper	* Changed version of gcc to 4.0.1 - 5484 on darwin	2009-06-21 18:37:54 +00:00
nuke-references
release	revert change from ludo rev. 18634. for now this order is needed for the stratego packages in the buildfarm, and the order should matter as normally nothing gets built in check phase that is needed for install phase	2009-11-26 06:52:13 +00:00
src-only
substitute
upstream-updater	Roll back SBCL	2009-11-06 10:13:00 +00:00
vm	* Move `modifyDerivation' from build-support/vm to lib and rename it	2009-11-19 16:43:58 +00:00
trivial-builders.nix	Fix linkFarm for its new location	2009-11-23 19:28:03 +00:00