William A. Kennington III 773b4deb7c Merge commit 'a6f6c0e' into master.upstream ... This is a partial merge of staging where we have up to date binaries for all packages.		2015-09-15 12:16:49 -07:00
..
applications	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
build-support	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
data	all-packages: Use callPackage where possible	2015-09-14 22:27:19 -06:00
desktops	Remove all references to haskell-ng and haskellngPackages from Nixpkgs.	2015-09-15 16:11:58 +02:00
development	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
games	all-packages: Use callPackage where possible	2015-09-14 22:27:19 -06:00
misc	all-packages: Use callPackage where possible	2015-09-14 22:27:19 -06:00
os-specific	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
servers	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
shells	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
stdenv	Merge branch 'master.upstream' into staging.upstream	2015-08-28 17:55:20 -07:00
test
tools	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
top-level	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00