Daniel Peebles 0bb14e4fea Disable NFC on 3.17 or above ... This should only be temporary, but there's a bug in the 3.17 rc1 and rc2 that leads to cyclic module dependencies and a segfault during the build process.		2014-08-29 01:49:32 -04:00
..
applications	Merge pull request #3527 from AndersonTorres/mpv	2014-08-29 01:41:22 +04:00
build-support	build-support: Fix nix-prefetch-* on OS X.	2014-08-27 11:22:34 +02:00
data	Add comic-neue font.	2014-08-28 13:05:45 +02:00
desktops	gnome3.gitg: fix build by updating it to unstable	2014-08-28 20:53:01 +02:00
development	Merge pull request #3275 from taku0/gtk-env	2014-08-29 01:35:38 +04:00
games	openspades: fix build by using fetchurl to download DevPaks27.zip.	2014-08-26 11:48:02 +02:00
misc	ppsspp: update to 0.9.9.1	2014-08-25 10:14:44 +02:00
os-specific	Disable NFC on 3.17 or above	2014-08-29 01:49:32 -04:00
servers	rabbitmq-server: updated to 3.3.5	2014-08-28 17:36:13 +02:00
shells	pythonPackges.ipython: 2.0.0 -> 2.2.0	2014-08-25 11:01:31 +02:00
stdenv	Merge pull request #2455 from bjornfor/helpful-messages-when-refusing-eval	2014-08-12 20:18:10 +02:00
test
tools	Merge pull request #3745 from wkennington/master.dnsmasq	2014-08-29 01:43:41 +04:00
top-level	Merge pull request #3527 from AndersonTorres/mpv	2014-08-29 01:41:22 +04:00