Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
attrsets.nix	Add a library function ‘genAttrs’	2013-03-06 16:33:01 +01:00
composable-derivation.nix
customisation.nix	Revert "Revert "Revert "overrideDerivation: Simplify"""	2013-05-07 10:49:22 +02:00
debug.nix	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
default.nix
licenses.nix	pythonPackages.buildout: update to 1.7.1 and also:	2013-04-17 01:25:45 +02:00
lists.nix	Remove broken ‘removeList’ function	2013-03-26 11:58:59 +01:00
maintainers.nix	Google killed my old email	2013-04-24 16:22:28 +03:00
meta.nix	Fix hiPrio.	2013-02-25 06:31:19 -05:00
misc.nix	poppler: share most things between glib and qt4 versions	2013-04-21 20:15:38 +00:00
modules.nix	Revert "Add isPath to trivial.nix"	2013-05-02 15:04:21 -04: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	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
systems.nix
tests.nix	fix sort in lists.nix	2012-11-20 13:56:14 +01:00
trivial.nix	Revert "Add isPath to trivial.nix"	2013-05-02 15:04:21 -04:00
types.nix	Revert "Add isPath to trivial.nix"	2013-05-02 15:04:21 -04:00