Vladimír Čunát e51f73652d Merge recent master into staging ... Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)		2014-08-30 10:04:02 +02:00
..
attrsets.nix
composable-derivation.nix
customisation.nix
debug.nix
default.nix
licenses.nix	List NCSA license properly	2014-08-29 01:14:10 +04:00
lists.nix
maintainers.nix	Adding flashrom BIOS update utility. Patch by Edward O'Callaghan	2014-08-29 01:27:28 +04:00
meta.nix
misc.nix
modules.nix
options.nix
platforms.nix
sources.nix	Manual: Handle XML files in subdirectories	2014-08-25 14:33:33 +02:00
strings-with-deps.nix
strings.nix
systems.nix
tests.nix
trivial.nix
types.nix