build-fhs-chrootenv: bind mount chroots /tmp to hosts /tmp
fix location of options.xml
Merge pull request #4009 from manveru/fix-nixos-doc

fix location of options.xml
added darwin ass supported platform for meld, added get text as requirement for scroollkeeper
Merge pull request #4012 from ibeex/master

added darwin as supported platform for meld
nixos/jenkins: add services.jenkins.extraOpts option

Allows passing extra command line arguments to Jenkins.
nixos/jenkins: remove use of types.string (it's deprecated)
nixos/jekins: rename option services.jenkins.{extraOpts => extraOptions}

I noticed "extraOptions" is infinitely more used than "extraOpts" in
NixOS.
Added TORQUE package and nixos module

Resource management system for submitting and controlling
jobs on supercomputers, clusters, and grids

http://www.adaptivecomputing.com/products/open-source/torque
coq_HEAD: update to latest Git version

In particular, to get the fix for #3585 in the Coq bug tracker
add a nix expression for the (haskell) 'managed' package
linssid: new package

LinSSID is a graphical wireless scanning application for Linux.

http://sourceforge.net/projects/linssid/
Merge branch 'add-haskell-managed' of git://github.com/alpmestan/nixpkgs
Merge pull request #4007 from hrdinka/chrootenv-bind-tmp

build-fhs-chrootenv: bind mount chroots /tmp to hosts /tmp
lua-5.1: fix CVE-2014-5461 by upstream+Debian patch
lua5 sockets: our version only works with lua 5.1
lua: migrate some pkgs, 5.1 -> 5.2
ekiga: fix icons. Closes #4015
s/dependancy/dependency/
iw: 3.14 -> 3.15