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
..
attrsets.nix	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
composable-derivation.nix	replacing applyAndFun by lib.defaultOverridableDelayableArgs	2009-03-06 23:21:28 +00:00
customisation.nix	* Move makeOverridable out of all-packages.nix.	2009-11-19 17:30:21 +00:00
debug.nix	testAllTrue helper function	2009-11-22 21:28:46 +00:00
default.nix	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
lists.nix	* Add a function to sort a list.	2009-11-07 01:59:55 +00:00
maintainers.nix	* Add the Go Programming Language compiler.	2009-11-14 20:14:28 +00:00
meta.nix	* Move some functions for manipulating meta and name attributes out of	2009-03-30 13:22:19 +00:00
misc.nix	nix lib: add nixType returning type of value as string which is used in	2009-11-22 21:28:43 +00:00
modules.nix	* Add a function to replace "pkgs.checker". The function checkModule does a	2009-11-07 01:59:50 +00:00
options.nix	* Add "_args" to all sub-module configurations result. This attribute	2009-11-07 01:59:45 +00:00
platforms.nix	add x86_64-darwin as platform	2009-11-26 15:03:42 +00:00
properties.nix	* Fix typo and clarify why you should not use "mkFixStrictness" on top of	2009-11-07 16:24:11 +00:00
sources.nix	cleanSource: Avoid copying git files.	2009-07-06 16:19:52 +00:00
strings-with-deps.nix	* Remove the warning, it's rather annoying.	2009-08-26 14:13:05 +00:00
strings.nix	Improve the efficiency of stringToCharacters.	2009-10-06 09:21:58 +00:00
systems.nix	Add systems.nix give more control over the increasing list of supported	2009-11-19 17:19:39 +00:00
tests.nix	follow runTests change prefixing all tests by "test"	2009-11-22 21:28:41 +00:00
trivial.nix	svn path=/nixpkgs/trunk/; revision=17934	2009-10-23 07:34:56 +00:00
types.nix	Add systems.nix give more control over the increasing list of supported	2009-11-19 17:19:39 +00:00