Peter Simons 7b7d06f91e Merge pull request #2123 from jagajaga/haskell_add_pkgs ... Haskell add pkgs		2014-04-04 23:52:13 +02:00
..
applications	pidgin: adopt the orphan, as I use it daily	2014-04-04 20:29:49 +02:00
build-support	gcc-wrapper: don't fail when cpp doesn't exist	2014-04-02 19:07:58 +02:00
data	manpages: update from 3.62 to 3.63	2014-04-03 07:59:39 +03:00
desktops	Merge branch vcunat@NixOS:p/stdenv (close #1840)	2014-04-04 21:33:55 +02:00
development	Merge pull request #2123 from jagajaga/haskell_add_pkgs	2014-04-04 23:52:13 +02:00
games	Merge master into x-updates	2014-04-01 10:49:31 +02:00
misc	nixpkgs-lint: add the platforms meta attr for most of my packages	2014-03-16 12:08:26 +01:00
os-specific	hostapd: update from 2.0 to 2.1	2014-04-03 07:05:07 +03:00
servers	Merge branch 'x-updates'	2014-04-02 15:30:52 +02:00
shells	fish: Fix propagatedBuildInputs and other assorted changes	2014-02-15 12:17:06 +01:00
stdenv	stdenv/setup.sh: make substitute* not drop EOF newline	2014-04-02 19:07:59 +02:00
test
tools	Merge branch vcunat@NixOS:p/stdenv (close #1840)	2014-04-04 21:33:55 +02:00
top-level	Merge pull request #2123 from jagajaga/haskell_add_pkgs	2014-04-04 23:52:13 +02:00