Elixir's mix shouldn't be added to wrapProgram
Add package: opencryptoki

Make tpm-tools depend on opencryptoki as well.
Add trustedGrub package.
Add package: simple-tpm-pk11

Simple PKCS11 provider for TPM chips
drop permission prestart from polipo service module

chowning the cache directory can timeout the service, permissions
on this directory should never change without user intervention
talloc: Fix linker flags on darwin.

Before this patch, building talloc on darwin (OS X 10.8.5) results in:

gcc -dynamiclib -Wl,-search_paths_first -undefined error -o libtalloc.dylib.2.0.1 ./talloc.o  ./libreplace/replace.o ./libreplace/snprintf.o ./libreplace/getpass.o ./libreplace/strptime.o   -install_namelibtalloc.dylib.2
gcc: error: unrecognized command line option '-install_namelibtalloc.dylib.2'
make: *** [libtalloc.dylib.2.0.1] Error 1

Setting SONAMEFLAG to either "-install_name " (note trailing space), or
"-Wl,-install_name," results in a successful build. The latter seems
more clear.
notmuch: Use 'find' to patch test script shebangs.
notmuch: Dynamic link to absolute path on darwin.
Added line SCSI_SAS_ATA y on line 62

This kernel change will make the nixOS live cd detect the hard drive upon boot.
Added package for fcitx-configtool.

This allows fctix to be configured through a GUI.
tsocks: fix LD_PRELOAD references
tsocks: support poll(2) applications
mysql: make cleaner directory layout for 5.5.*
update cjdns from 20140922 to 20140928
cjdns: add peer hostnames to extraHosts, option for external config
update chocolateDoom to v2.1.0, chocolateDoomMaster removed
kde4: Use plasma-nm instead of knetworkmanager
rpmextract: accept multiple input files
Revert "chromium: update dev, beta, stable channels"

This reverts commit 32df2a083842bf22cf5f47c0561c19a646c40df2.

See
https://github.com/NixOS/nixpkgs/commit/32df2a083842bf22cf5f47c0561c19a646c40df2#commitcomment-8260774
nodejs: disable usage of http-parser library on darwin, because it breaks the build