Add argument to oraclejdk to allow installation of Java Cryptography Extension with unlimited strength. User needs to download these themselves, and need to accept a license agreement (Java SE BCL License Agreement)
asciidocFull: add missing sed + coreutils for a2x wrapper

When making a PDF file I got an error because dblatex couldn't find
sed/uname/mkdir etc. This fixes it.
Generate a VirtualBox appliance (in OVF format) instead of a disk image
torsocks: update to 1.3
Update nixops to 1.1.1
kde4: install mysql by default since it's used by akonadi
Updating paraview to 4.0.1.
Move all of NixOS to nixos/ in preparation of the repository merge
Merge the NixOS repository into Nixpkgs
Move pkgs/lib/ to lib/
Fix references to pkgs/lib
Unify the Nixpkgs and NixOS version numbers
Update the release expressions and the channel generators
nixos-checkout: Only fetch the Nixpkgs repo
Merge .gitignore files