Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix		2013-03-02 10:41:53 +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
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	Fix hiPrio.	2013-02-25 06:31:19 -05:00
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
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	pkgs/lib/strings.nix: strip trailing whitespace	2013-02-24 19:28:38 +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