Add the bspwm window manager to Nix.
haskell-djinn: only mark as broken for GHC 7.8.3
haskell-lambdabot: only mark as broken for GHC 7.8.3
Revert "lib/licenses.nix: allow choosing license by its shortName"

There's no consensus to adopt that (yet).
This reverts commit 229e5c41df8db960de9d57b247107b6239a60383.
Merge #3408: licenses: prefer spdx.org, improve docs

The patch to allow using license shortnames as attributes
was not included (yet).

Conflicts (auto-solved):
	pkgs/development/libraries/libtiff/default.nix
haskellPackages.bound: New expression
Merge master into #2129

Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix
PR fixups: use mirror://, drop unused params, etc.

Note: hash of trousers tarball didn't match (anymore),
so I updated it to the one from sourceforge.
It's probably some safe and tiny retrospective update.
Aegisub: update to 3.2.0
Merge #2129: add trusted computing components
initrd.availableKernelModules: add support for keyboards

As explained in #2169, some keyboards need special drivers,
so these are always added, both on installation and normal systems.
Merge pull request #2455 from bjornfor/helpful-messages-when-refusing-eval

More helpful message when refusing to evaluate "broken" package
Merge #3152: add pyqt5
Merge #3248: add glmark2-2014.03
glmark2: style fixups
nixos/lighttpd: fix modules for gitweb

Setting "services.lighttpd.gitweb.enable" to true doesn't enable the
required lighttpd modules to actually make it work. The problem is that
"or" and "||" don't mean the same thing: "or" falls back to the second
operand if the first is not defined, whereas "||" is the normal logical
operator. When cfg.cgit.enable is defined, as false, the expressions
don't have the desired effect.

[Bjørn: modify commit message]
Merge master into this PR
hugin, enblend-enfuse: enbaleParallelBuilding, default boost

Also unset meta.broken.
Merge #3251: fix hugin and enblend-enfuse by updating

A few fixups included.
pycharm: add icon in desktop file