Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ... Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix		2014-09-02 12:31:03 +02:00
..
attrsets.nix
composable-derivation.nix
customisation.nix
debug.nix
default.nix
licenses.nix	licenses: comment about two versions of MIT	2014-08-30 07:28:26 +02:00
lists.nix
maintainers.nix	Add xar	2014-08-30 22:52:46 +01:00
meta.nix
misc.nix
modules.nix	Add error an message to prevent use of useless submodules.	2014-08-29 18:54: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	Manual: Handle XML files in subdirectories	2014-08-25 14:33:33 +02:00
strings-with-deps.nix
strings.nix	Added concatMapStringsSep and concatImapStringsSep	2014-08-25 10:23:10 +02:00
systems.nix
tests.nix
trivial.nix
types.nix	types.nix: Add ‘either’ type	2014-08-19 18:24:37 +02:00