Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates ... x-updates is supposed to merge after stdenv-updates, so let's test it Conflicts: pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer) pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)		2013-02-21 12:43:00 +01:00
..
attrsets.nix	Add deepSeq lib function	2013-02-01 00:39:26 -05:00
composable-derivation.nix
customisation.nix	Rename hostDrv -> crossDrv, buildDrv -> nativeDrv	2012-12-28 19:08:19 +01:00
debug.nix	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
default.nix
licenses.nix	- zfs 0.6.0-rc11, spl 0.6.0-rc11	2012-10-05 09:11:25 -07:00
lists.nix	Add deepSeq lib function	2013-02-01 00:39:26 -05:00
maintainers.nix	add deluge torrent client and it's dependencies	2013-02-18 00:00:39 +01:00
meta.nix
misc.nix	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
modules.nix	Use "or" in a few places	2012-12-04 12:58:23 +01:00
options.nix	Replace some calls to attrByPath with "or"	2012-08-13 15:15:16 -04:00
platforms.nix	Adding some 'arm' as mesa platforms. Otherwise assertions won't let me	2013-02-17 15:55:47 +01:00
properties.nix	Get rid of some error contexts that don't provide useful info	2012-12-04 12:58:22 +01:00
sources.nix
strings-with-deps.nix
strings.nix	Major Xfce refactoring, also adding versions 4.10.*	2013-02-09 18:38:26 +01:00
systems.nix
tests.nix	fix sort in lists.nix	2012-11-20 13:56:14 +01:00
trivial.nix	Document deepSeq	2013-02-04 07:20:14 -05:00
types.nix	types.nix: Add a ‘lines’ type	2013-02-11 15:32:24 +01:00