Peter Simons e0632b21dc Merge pull request #3613 from phunehehe/HaskellNet-SSL ... add HaskellNet-SSL		2014-08-15 18:30:56 +02:00
..
applications	Merge pull request #3598 from vesten/update-bar-aint-recursive	2014-08-15 18:29:49 +02:00
build-support	Add http mirror for postgresql.	2014-08-14 19:17:26 +02:00
data	Merge pull request #3211 from ttuegel/adobe-fonts	2014-08-08 21:52:59 +02:00
desktops	gpaste: new package	2014-08-14 21:16:42 +02:00
development	Merge pull request #3613 from phunehehe/HaskellNet-SSL	2014-08-15 18:30:56 +02:00
games	haskell-Allure: add version 0.4.99.0	2014-08-12 12:37:44 +02:00
misc	Merge branch 'new-vim-plugins' of git://github.com/ts468/nixpkgs	2014-08-14 21:32:52 -04:00
os-specific	kernel: 3.2.60 -> 3.2.62	2014-08-14 12:48:06 -05:00
servers	Add taskserver package (close #3269)	2014-08-15 00:28:41 +02:00
shells	Merge 'staging' into master	2014-08-08 20:13:23 +02:00
stdenv	Merge pull request #2455 from bjornfor/helpful-messages-when-refusing-eval	2014-08-12 20:18:10 +02:00
test
tools	Merge pull request #3597 from Fuuzetsu/rtorrent-xmlrpc	2014-08-15 12:07:44 +02:00
top-level	Merge pull request #3613 from phunehehe/HaskellNet-SSL	2014-08-15 18:30:56 +02:00