Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates ... Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix		2013-04-04 21:43:40 +02:00
..
attrsets.nix	Add a library function ‘genAttrs’	2013-03-06 16:33:01 +01:00
composable-derivation.nix
customisation.nix	Add the addPassthru library function	2013-03-24 08:29:10 -04:00
debug.nix	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
default.nix
licenses.nix	pkgs/lib/licenses.nix: strip trailing whitespace	2013-03-24 22:45:48 +01:00
lists.nix	Remove broken ‘removeList’ function	2013-03-26 11:58:59 +01:00
maintainers.nix	Add myself (the-kenny) to the maintainer list.	2013-03-30 21:05:15 +01:00
meta.nix	Fix hiPrio.	2013-02-25 06:31:19 -05:00
misc.nix	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
modules.nix	Use "or" in a few places	2012-12-04 12:58:23 +01:00
options.nix
platforms.nix	Adding some 'arm' as mesa platforms. Otherwise assertions won't let me	2013-02-17 15:55:47 +01:00
properties.nix	Get rid of some error contexts that don't provide useful info	2012-12-04 12:58:22 +01:00
sources.nix
strings-with-deps.nix
strings.nix	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
systems.nix
tests.nix	fix sort in lists.nix	2012-11-20 13:56:14 +01:00
trivial.nix	Document deepSeq	2013-02-04 07:20:14 -05:00
types.nix	types.nix: Add a ‘lines’ type	2013-02-11 15:32:24 +01:00