Vladimír Čunát 1575bc652e Merge branch 'master' into staging ... Conflicts (simple): pkgs/os-specific/linux/util-linux/default.nix It seems this merge creates a new stdenv hash, because we had changes on both branches :-/		2015-01-13 18:07:11 +01:00
..
attrsets.nix	lib: Fix matchAttrs by importing builtins.length	2014-12-30 15:07:29 -08:00
composable-derivation.nix	Shea told me composableDerivation is hard to understand.	2014-04-30 20:31:40 +02:00
customisation.nix	Revert "Revert "mkOverridable: Use functors to allow overridable functions""	2015-01-13 08:39:54 -05:00
debug.nix	Remove obsolete checks for missing primops	2014-10-05 01:10:37 +02:00
default.nix	Add some primops to lib	2013-11-12 13:48:30 +01:00
licenses.nix	lib/licenses: add IJG (Independent JPEG...)	2015-01-13 16:55:11 +01:00
lists.nix	Add unique list function	2014-11-12 22:31:49 +01:00
maintainers.nix	Add Eric Seidel as a maintainer	2015-01-03 07:29:35 -05:00
meta.nix	Make appendToName do the right thing	2014-03-10 15:01:56 +01:00
misc.nix	Replace hasAttr/getAttr calls with the ? and . operators	2014-10-05 01:11:06 +02:00
modules.nix	modules: Extract mkAliasDefinition from the rename.nix NixOS module.	2014-12-22 22:38:38 +01:00
options.nix	Add Type information into manual and manpages, fixes #4600	2015-01-04 15:41:32 +01:00
platforms.nix	lib/platforms: add "armv6l-linux" to all platforms	2014-09-27 11:23:03 +02:00
sources.nix	Manual: Handle XML files in subdirectories	2014-08-25 14:33:33 +02:00
strings-with-deps.nix	Replace hasAttr/getAttr calls with the ? and . operators	2014-10-05 01:11:06 +02:00
strings.nix	lib: Use arithmetic operators rather than builtins.add etc.	2014-10-05 01:10:06 +02:00
systems.nix	lib: Use arithmetic operators rather than builtins.add etc.	2014-10-05 01:10:06 +02: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	Remove types.functionTo.	2014-09-07 19:41:45 +02:00