Vladimír Čunát 7e0b78f7b2 Merge master into x-updates ... Conflicts (re-created on master, preserved): pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch		2014-01-23 22:52:18 +01:00
..
unichrome	Mark more packages as broken	2013-11-04 21:11:00 +01:00
builder.sh	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
default.nix	Merge master into x-updates	2014-01-23 22:52:18 +01:00
extra.list	xorg: update a few sub-packages	2013-12-30 22:12:22 +01:00
generate-expr-from-tarballs.pl	luit: fix build with newer gcc (close #734)	2013-07-27 19:56:22 +02:00
imake.patch	* Update the imake patch.	2010-07-19 10:18:06 +00:00
imake.sh	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
libpciaccess-apple.patch	Get libpciaccess to compile on darwin	2011-08-29 18:58:59 +00:00
old.list	X security updates	2013-06-05 21:24:19 +02:00
overrides.nix	Merge master into x-updates	2014-01-23 22:52:18 +01:00
replacements.nix	* composedArgsAndFun -> makeOverridable for consistency.	2010-07-29 08:21:21 +00:00
tarballs-7.7.list	Merge master into x-updates	2014-01-23 22:52:18 +01:00
xorgserver-xkbcomp-path.patch	xorgserver: Update xkbcomp-path patch	2012-07-14 15:13:08 -04:00