Lluís Batlle i Rossell 9183f21f7e Merging from trunk. ... I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438		2010-01-14 14:49:31 +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
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 take the last element of a list.	2010-01-03 11:05:42 +00:00
maintainers.nix	Added myself to the maintainers list.	2010-01-06 17:26:44 +00:00
meta.nix
misc.nix	remove mapRecordFlatten & fix source autofs	2009-12-16 05:52:36 +00:00
modules.nix	* Support require/imports in top-level anonymous configurations,	2010-01-05 17:04:55 +00:00
options.nix
platforms.nix	add x86_64-darwin as platform	2009-11-26 15:03:42 +00:00
properties.nix
sources.nix
strings-with-deps.nix
strings.nix	* Retrieve the filename of a path.	2010-01-03 11:07:05 +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	nixpkgs lib: adding haskell's take	2009-12-08 21:47:14 +00:00
trivial.nix
types.nix	Add systems.nix give more control over the increasing list of supported	2009-11-19 17:19:39 +00:00