Shea Levy 345a8a1c39 Merge branch 'master' of git://github.com/sol/nixpkgs ... Update haskell-http-kit to version 0.3.0		2014-05-16 10:46:05 -04:00
..
applications	Merge pull request #2662 from wkennington/master.mumble	2014-05-16 09:15:14 +02:00
build-support	Add -p to mkdir in build-fhs-chrootenv to prevent error if directory exists	2014-05-15 18:38:45 +12:00
data	Add eb-garamond font (close #2553)	2014-05-13 12:07:50 +02:00
desktops	Merge pull request #2375 from lethalman/gnome3	2014-05-13 12:04:11 +02:00
development	Merge branch 'master' of git://github.com/sol/nixpkgs	2014-05-16 10:46:05 -04:00
games	haskell-MazesOfMonad: remove broken package	2014-05-14 15:02:33 +02:00
misc	Merge pull request #2580 from ttuegel/qtcurve	2014-05-13 11:30:50 +02:00
os-specific	linux-3.12: Apply patch for CVE-2014-0196	2014-05-14 14:11:48 +02:00
servers	lib/maintainers: add "berdario", maintain redis	2014-05-15 21:11:17 +02:00
shells
stdenv	s/config.allowUnfree = true/allowUnfree = true/	2014-05-03 15:13:01 +02:00
test
tools	Merge branch 'monit-5.8' of github.com:wmertens/nixpkgs	2014-05-15 14:42:20 +02:00
top-level	Merge pull request #2589 from linquize/cccc	2014-05-16 09:16:25 +02:00