fixed a patch which was rejected, i wonder why it was still there...
Merge branch 'master' of github.com:NixOS/nixpkgs
linux: Update to 3.2.50
linux: properly parse config choice when it's new
linux: update grsecurity patch
Upgraded nodejs packages
Merge branch 'master' of github.com:NixOS/nixpkgs
Add erlang R16B1

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Package elixir and rebar.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Add meta for elixir & rebar.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Add myself as a maintainer to erlang R16B1 and elixir.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Update leiningen to 2.3.0.

Unfortunately, leiningen will now pull in some dependencies via maven (via http) on `lein version' so the test at the end of builder.sh failed. This is okay because leiningen is used only as a interactive tool and no other package in Nixpkgs depends on it.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
linux: Use kmod instead of module-init-tools
Kernel module aggregator: Use kmod instead of module-init-tools
virtualbox: Update to 4.2.16
Add taskjuggler ruby gem

Unfortunately, this changes lots of unrelated gems.
Adding ponysay.
Merge branch 'master' of github.com:bodil/nixpkgs
Merge pull request #813 from bodil/master

Add Ponysay
vifm: update to 0.7.5 and enabling new options