Add oxygen-gtk3 and rename oxygen_gtk to oxygen-gtk2.

oxygen_gtk is still kept for backwards compatibility.
chocolateDoom and chocolateDoomMaster added

chocolate doom is a port that aims to recreate the experience of Doom in the 1990s
as accurately as possible
Add notice for chocolateDoomMaster
Revert "spaceFM: update from 0.9.2 to 0.9.4" (fixes #3916)

This reverts commit c53ae9b46251b0c7e4906cd556a20d921c45d645.
It's just a temporary work-around until someone finds a real fix.
fixes #1923
Fix chocolateDoom and chocolateDoomMaster descriptions
unetbootin: 603 -> 608
nox: updated sha to work after the recent fetchgit changes
Merge pull request #4006 from madjar/master

I'm not sure whether fetchgit with `leaveDotGit` can ever be made deterministic... But I'll merge anyway.
build-fhs-chrootenv: bind mount chroots /tmp to hosts /tmp
Revert "fixes #1923"

This reverts commit 1849840aa3d967ea9b943d79a7b56860570fd28a.

Breaks git-annex
Merge pull request #3934 from MP2E/chocolate-doom

chocolateDoom and chocolateDoomMaster added
Add Jim Tcl interpreter
jimtcl: remove end dot from description
fix location of options.xml
kde4: added the security patch for CVE-2014-5033 to nixpkgs because it is not available upstream
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.