Peter Simons ac82dd8233 Merge pull request #5792 from gridaphobe/darwin-haskell-ng ... Haskell-ng: don't use cpphs by default on darwin		2015-01-16 09:48:25 +01:00
..
applications	Merge pull request #5773 from matthiasbeyer/add-cortex	2015-01-15 18:32:48 +01:00
build-support	Update Debian to 7.8	2015-01-15 14:51:55 +01:00
data	source-han-sans: update, and refactor expressions	2015-01-15 14:09:00 +01:00
desktops	rage: fix video for gstreamer engine	2015-01-13 14:59:53 +01:00
development	Merge pull request #5792 from gridaphobe/darwin-haskell-ng	2015-01-16 09:48:25 +01:00
games	instead: update from 1.9.1 to 2.2.0 and adopt it	2015-01-15 00:42:17 +01:00
misc	Wine unstable: 1.7.33 -> 1.7.34	2015-01-11 16:43:29 +03:00
os-specific	grsecurity: Update stable and test patches	2015-01-16 02:47:12 +01:00
servers	couchdb: fix build	2015-01-16 08:51:22 +01:00
shells	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
stdenv	stdenv: improve message on evaluation check (no hash changes)	2015-01-11 21:38:19 +01:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Turn nixUnstable back on	2015-01-15 22:47:47 -05:00
top-level	Turn nixUnstable back on	2015-01-15 22:47:47 -05:00