Peter Simons 9b4e914dac Merge pull request #2171 from ocharles/remove-lens-aeson ... Remove haskellPackages.lensAeson		2014-04-09 11:53:07 +02:00
..
applications	flashplayer: Update from 11.2.202.346 -> 11.2.202.350	2014-04-08 17:45:52 +02:00
build-support	Merge branch 'make-the-kernel-build-repeatable' of git://github.com/alexanderkjeldaas/nixpkgs	2014-04-06 17:02:16 -04:00
data	manpages: update from 3.62 to 3.63	2014-04-03 07:59:39 +03:00
desktops	cinnamon gschemas: fix wrong and pointless part	2014-04-06 21:40:55 +02:00
development	Merge pull request #2171 from ocharles/remove-lens-aeson	2014-04-09 11:53:07 +02:00
games	Merge master into x-updates	2014-04-01 10:49:31 +02:00
misc
os-specific	lockdep: refactor into non-kernel package	2014-04-08 19:21:55 -05:00
servers	munin: 2.0.19 -> 2.0.20	2014-04-09 11:29:47 +02:00
shells
stdenv	Add a flag ‘config.allowBroken’	2014-04-09 00:13:52 +02:00
test
tools	stunnel: adopt, bump to version 5.01	2014-04-08 16:13:52 -05:00
top-level	Merge pull request #2171 from ocharles/remove-lens-aeson	2014-04-09 11:53:07 +02:00