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 Remove backward-compatible implementations of some primops 2013-11-12 13:50:45 +01:00
composable-derivation.nix Shea told me composableDerivation is hard to understand. 2014-04-30 20:31:40 +02:00
customisation.nix Move pkgs/lib/ to lib/ 2013-10-10 13:28:21 +02:00
debug.nix Move pkgs/lib/ to lib/ 2013-10-10 13:28:21 +02:00
default.nix Add some primops to lib 2013-11-12 13:48:30 +01:00
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 Make appendToName do the right thing 2014-03-10 15:01:56 +01:00
misc.nix Small cleanup 2013-10-24 14:49:59 +02:00
modules.nix minor fix in documentation 2014-06-26 11:13:15 +02:00
options.nix Add some primops to lib 2013-11-12 13:48:30 +01:00
platforms.nix Merge #2823: better cygwin support, also add x86_64 2014-08-14 20:38:09 +02:00
sources.nix cleanSources: Filter *.o and *.so 2014-02-06 12:30:26 +01:00
strings-with-deps.nix Move pkgs/lib/ to lib/ 2013-10-10 13:28:21 +02:00
strings.nix lib: Do not take string context into account 2014-06-11 20:22:58 +02:00
systems.nix Use isType instead of typeOf 2013-10-28 22:45:55 +01:00
tests.nix Move pkgs/lib/ to lib/ 2013-10-10 13:28:21 +02:00
trivial.nix Add a global variable ‘inNixShell’ 2014-02-19 19:03:16 +01:00
types.nix types.nix: Add ‘either’ type 2014-08-19 18:24:37 +02:00