Peter Simons 54ce1a1810 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/development/compilers/ghc/head.nix pkgs/top-level/haskell-ng.nix		2015-02-13 22:13:25 +01:00
..
darwin	Pretty sure nothing uses these, since they don't work (and we have a replacement in apple-source-releases)	2015-02-08 23:36:19 -05:00
gnu	gnu: Fix (evaluation of the) call to forceSystem.	2014-07-28 20:46:32 +02:00
linux	Merge remote-tracking branch 'origin/master' into staging.	2015-02-13 22:13:25 +01:00
windows	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00