Eelco Dolstra 552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/atk/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/gmime/default.nix pkgs/development/libraries/pango/default.nix pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix		2013-06-25 18:42:56 +02:00
..
bootstrap	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
scripts	unpack-bootstrap-tools: Removing the patch of libstdc++	2012-12-30 13:53:48 +00:00
default.nix	gcc: Put runtime libraries in a separate output	2013-06-12 16:11:14 +02:00
make-bootstrap-tools-crosspi.nix	Adapting make-bootstrap-tools-crosspi.nix to crossDrv	2012-12-28 21:22:13 +01:00
make-bootstrap-tools.nix	* Don't use the "replace-literal" command in stdenv; instead use	2012-01-19 13:47:26 +00:00