ati-drivers: bump version to 14.4
ati_unfree: Create a nixos module for the ati_unfree x11 driver and
blacklist the radeon driver when ati_unfree is installed.
ati_unfree: Towards using ati unfree 32bit binary libs
ati_unfree: Update nixos-manual for AMD driver support
set network manager as default true
new package: cmst - qt gui for connman
Adds ocaml-fix

Fix is a simple OCaml module for computing the least solution of a system of monotone equations.

Homepage: http://gallium.inria.fr/~fpottier/fix/
Adds ocaml-pprint

Pprint is an OCaml adaptation of Wadler’s and Leijen’s prettier printer.

Homepage: http://gallium.inria.fr/~fpottier/pprint/
Adds ocaml-functory

Functory is a distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion. Further, it is
polymorphic, incorporates a robust fault-tolerant mechanism and is already being deployed in real-world applications.

Homepage: https://www.lri.fr/~filliatr/functory/
Adds mezzo

Mezzo is a programming language in the ML tradition, which places strong
emphasis on the control of aliasing and access to mutable memory.

Homepage: http://protz.github.io/mezzo/
dcfldd: added advanced dd replacement
Upgraded python-psutil to v2.1.1
Bumped version of sublime3
Fixed file name with new version
Merge branch 'master' of github.com:wyvie/nixpkgs into wyvie-master
r-jsonlite: update to 0.9.11
r-rgdal/rgeos: adding gdal geos and proj as dependency
New packages: pam_mount and libHX

Add pam_mount package. Integration into NixOS is still missing.
Merge branch 'upstream' into pam_mount

Conflicts:
	pkgs/top-level/all-packages.nix
Fix description in pam_mount and libHX. Add tstrobel as maintainer.