Elixir's mix shouldn't be added to wrapProgram
pythonPackages.cvxopt: added package
seeks: upgrade and add optional seeks_confDir
seeks: nixos module
Update broadcom-sta and fix for new kernels
texlive: Updated to latest release 2014.20140927
Revert "tagainijisho: new derivation"

This reverts commit d62b63d3190f46ae75b0dbbbc42cd2b450c4ba65.

Fails to download dependencies. See http://hydra.nixos.org/build/15845724
python: make 2.6 and 2.7 expr similar, introduce includeModules

When includeModules is true, python is built with all optional modules
as part of derivation.
pythonFull -> python with all modules, pythonFullWithPkgs -> buildEnv
lttng: update to latest (2.4.1 -> 2.5.0)

- This unbreaks lttng linux kernel modules[1]
- lttng-tools has grown a dependency on libxml2

[1]: Build tested (for default NixOS Linux kernel) and run tested with
lttng-sessiond (it successfully loads kernel modules).
Merge pull request #4400 from matejc/seeksservice

seeks: update and write nixos module
coqPackages.ssreflect, more: build ssrcoq binary, add maintainer
closes #463 pythonPackages now uses self variable instead of rec builtin
xcodeenv: make version 6.0.1 the default
Merge pull request #4507 from geerds/texlive

texlive: Update to latest release 2014.20140927
texlive: add jwiegley as a maintainer
titaniumenv: use xcode version 6.0.1 by default
tagainijisho: new derivation

Tagaini Jisho is a free, open-source Japanese dictionary and kanji
lookup tool that aims at becoming your Japanese study assistant.

Homepage: http://www.tagaini.net/

Closes #4509
Update: trousers 0.3.11 -> 0.3.13
Add package: opencryptoki

Make tpm-tools depend on opencryptoki as well.