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
makeModulesClosure: Use kmod instead of module-init-tools
nixpart: Add an alias called nixpart0.

The reason behind this is to avoid breaking NixOps while releasing
version 1.0 of nixpart. We could also use nixpart and nixpart1, but the
goal is to have nixpart as a generic part of NixOS instead of being only
used specifically for the Hetzner backend of NixOps.

Which essentially means: The partition syntax will change to be based on
attribute sets and we no longer need to use Kickstart syntax. And that's
the main reason why it will break in version 1.0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
chromium: Fix build for version 28 and NSS 3.15.

Build failure details:

http://hydra.nixos.org/build/5663358

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
chromium: Update beta channel to v29.0.1547.41.

Builds fine on my machine and tested with a bunch of web sites.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
The android GUI does not work if Oracle's JDK is installed. This patch forces it to use OpenJDK
pgadmin: 1.10.0 -> 1.16.1, add to channel
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