Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix		2013-06-13 17:12:43 +04:00
..
attrsets.nix
composable-derivation.nix
customisation.nix
debug.nix
default.nix
licenses.nix	adding unfree-redistributable-firmware	2013-06-05 22:44:17 +02:00
lists.nix
maintainers.nix	Merge pull request #606 from fignuts/master	2013-06-13 05:42:53 -07:00
meta.nix
misc.nix	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
modules.nix
options.nix	Merge submodule extraArgs and individualExtraArgs	2013-06-05 11:20:59 -04:00
platforms.nix
properties.nix
sources.nix
strings-with-deps.nix
strings.nix	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
systems.nix
tests.nix
trivial.nix
types.nix