Vladimír Čunát 17ae1617dc Merge branch 'master' into x-updates ... Conflicts (systemd version is split on x-updates): pkgs/os-specific/linux/systemd/default.nix		2013-04-13 12:21:31 +02:00
..
attrsets.nix	Add a library function ‘genAttrs’	2013-03-06 16:33:01 +01:00
composable-derivation.nix
customisation.nix	overrideDerivation: Simplify	2013-04-11 17:02:19 -04:00
debug.nix
default.nix
licenses.nix	Remove the "proprietary" license	2013-04-12 14:37:50 +02: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	dbus: minor update, reorganize and polish the expression	2013-04-11 22:17:26 +02:00
modules.nix
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
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
trivial.nix
types.nix	types.nix: Add a ‘lines’ type	2013-02-11 15:32:24 +01:00