Fix hardcoded paths in ztest
Merge remote-tracking branch 'upstream/master' into master_clean
Merge branch 'master_clean' of https://github.com/jcumming/nixpkgs into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
zfs-0.6.0-rc14, spl-0.6.0-rc14
python-linkme-wrapper: optimize some escaping
Merge pull request #302 from aristidb/pydb

pydb: mirror://sourceforge.net/ is no longer valid
Merge pull request #294 from jcumming/zfs.130201

zfs-0.6.0-rc14. spl-0.6.0-rc14
Mark ruby gems as such
#283: Patch buildout to be useful in a nix profile
lxml: upgrade from 2.2.2 to 3.0.2
gnumeric: Update to 1.12.0

Also update dependencies (goffice, libgsf) to required versions.
darktable: Update to 1.1.2
#283 add a set of Plone packages, a popular Python CMS

This set of packages for Plone was generated using
cillianderoiste/python2nix, which is forked from garbase/python2nix.

It uses ```buildout annotate``` to dump a set of packages and their
versions based on an installed Plone instance and then looks up these
packages on pypi, gets the relevant download url and sets some
(minimal) buildInputs where required.

The packages are not ready to be used on their own yet, since they
lack complete dependencies. In the future we can move complete package
expressions into a better location so that they can be re-used.

The packages are also lacking metadata. They are all available under
Free licenses (mostly Zope Public License, GPL or BSD), but the script
does not yet fill that information in. It should be pretty easy to get
hold of it, plus the short description and home page from pypi, this
will be added to the script in the future so that the license
information is accurate.
Merge branch 'master' of github.com:NixOS/nixpkgs
Rubygems: Fix deps.

Gem nix in nixpkgs is broken, will have to update it.
nvidia-x11: fix build with the latest Linux kernel
atlas: update to version 3.10.1

This patch fixes issue #297.
atlas: allow users to override the CPU configuration used to build ATLAS