calibre: upgrade from 1.17.0 to 1.20.0
Add gnome3.caribou
Add gnome3.mutter
Add gnome3.gjs
Update siege
Merge pull request #1555 from ocharles/siege

Update siege
Update siege to 3.0.5 and add meta information
scons: add pythonPath attribute to ensure that the python-wrapper recognizes this package as providing a python library
Merge pull request #1556 from ocharles/siege

Update siege to 3.0.5 and add meta information
Setting license to elinks.

Disabling guile, due to licence incompatibility.
Updating libvpx to 1.3.0, and making ffmpeg include vpx

I don't think there is any reason not to have vpx there. It's
part of webm.
Merge pull request #1551 from urv/master

calibre: upgrade from 1.17.0 to 1.20.0
libvpx: Don't install static library
postgresql: Add version 9.3
openjdk: Ugly hack to fix nix-env installation

Nix-env always wants to install all outputs of a derivation, but this
failed for openjdk/openjre because openjdk has some symlinks (such as
bin/java) to openjre.  Also, it prevents installing the openjre
without the openjdk.  So as a workaround, mess with the "outputs"
attribute to fool nix-env.

Also, give openjre a separate name and description.

Fixes #1535.
add hoodle (pen notetaking program written in haskell) to nixpkgs
haskellPackages.tastyRerun: New expression
happy: add version 1.19.3
haskell-case-insensitive: update to version 1.1.0.3
haskell-aeson: add version 0.7.0.0 (but don't use it yet)