nixpkgs/lib
Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
..
attrsets.nix
composable-derivation.nix Shea told me composableDerivation is hard to understand. 2014-04-30 20:31:40 +02:00
customisation.nix
debug.nix
default.nix
licenses.nix licenses: add LPL-102 2014-08-15 00:11:09 +02:00
lists.nix gnome3: use package names for environment.gnome3.excludePackages 2014-04-14 09:58:03 +02:00
maintainers.nix mailutils: fix for sendmail path 2014-08-15 21:16:33 +02:00
meta.nix
misc.nix
modules.nix minor fix in documentation 2014-06-26 11:13:15 +02:00
options.nix
platforms.nix Merge #2823: better cygwin support, also add x86_64 2014-08-14 20:38:09 +02:00
sources.nix
strings-with-deps.nix
strings.nix lib: Do not take string context into account 2014-06-11 20:22:58 +02:00
systems.nix
tests.nix
trivial.nix
types.nix types.nix: Add ‘either’ type 2014-08-19 18:24:37 +02:00