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
..
unichrome
builder.sh	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
default.nix	Making xlibs.xf86videovmware build	2013-02-27 06:44:41 +01:00
extra.list	Update TigerVNC to SVN checkout that at least builds..	2012-10-18 20:49:22 +04:00
generate-expr-from-tarballs.pl	Fix font-schumacher-misc build	2012-10-15 11:52:11 -04:00
imake.patch
imake.sh
libpciaccess-apple.patch
old.list
overrides.nix	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
replacements.nix
tarballs-7.7.list	Rolled back xf86-video-ati to 6.14.4.	2012-10-26 14:03:07 +02:00
xorgserver-dri-path.patch
xorgserver-xkbcomp-path.patch