Peter Simons 7d299447ae Revert "gmp: Use version 6 as the default" ... This reverts commit 370fc79b94, because it causes trouble on both Linux and Darwin, and we probably shouldn't have to worry about that kind of stuff right now with the 15.06 release being late'ish already.		2015-06-16 23:59:56 +02:00
..
applications	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-06-12 13:47:46 -07:00
data	nixos-artwork: only download the necessary artwork	2015-06-12 11:45:58 +02:00
desktops	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
development	libarchive: fix CVE-2015-1197 by upstream patch	2015-06-16 18:35:13 +02:00
games	Add Tales of Maj'eyal game.	2015-06-14 17:44:38 +01:00
misc	hplip 3.15.4 -> 3.15.6	2015-06-13 16:14:40 +02:00
os-specific	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
servers	xorgserver: Add gcc5 compat patch	2015-06-16 14:21:54 -07:00
shells	zsh: update from 5.0.7 to 5.0.8	2015-06-08 12:55:38 +02:00
stdenv	Don't include /no-such-path in buildInputs	2015-06-15 19:26:52 +02:00
test
tools	Merge branch 'master' into staging	2015-06-15 09:56:29 +02:00
top-level	Revert "gmp: Use version 6 as the default"	2015-06-16 23:59:56 +02:00