Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby ... svn path=/nixpkgs/branches/stdenv-updates/; revision=31721		2012-01-19 21:31:51 +00:00
..
attrsets.nix	* Indentation.	2011-11-02 17:13:24 +00:00
composable-derivation.nix
customisation.nix	overrideDerivation: Override hostDrv' and buildDrv' too.	2012-01-19 16:44:17 +00:00
debug.nix
default.nix
licenses.nix	Add yaml - Yet Another JSON Library	2011-10-14 14:00:50 +00:00
lists.nix	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
maintainers.nix	maintainers: added myself for upcoming packages	2012-01-18 20:32:31 +00:00
meta.nix
misc.nix
modules.nix
options.nix	* Allow literal examples to be included in the manual.	2011-09-05 10:14:24 +00:00
platforms.nix	* Mesa only builds on Linux.	2012-01-18 18:45:00 +00:00
properties.nix
sources.nix
strings-with-deps.nix
strings.nix
systems.nix
tests.nix
trivial.nix
types.nix	* Whitespace.	2011-10-26 17:58:53 +00:00