gnu: python2-pil: Adapt to newer Freetype.

* gnu/packages/python.scm (python2-pil): Add snippet.

gnu: Move 'which' to (gnu packages base).

* gnu/packages/which.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/base.scm (which): New variable.
* gnu/packages/aspell.scm, gnu/packages/audio.scm,
  gnu/packages/autogen.scm, gnu/packages/cdrom.scm,
  gnu/packages/compression.scm, gnu/packages/datamash.scm,
  gnu/packages/games.scm, gnu/packages/glib.scm,
  gnu/packages/gnu-pw-mgr.scm, gnu/packages/gnutls.scm,
  gnu/packages/gps.scm, gnu/packages/guile.scm,
  gnu/packages/java.scm, gnu/packages/libevent.scm,
  gnu/packages/linux.scm, gnu/packages/lisp.scm,
  gnu/packages/node.scm, gnu/packages/ntp.scm,
  gnu/packages/orpheus.scm, gnu/packages/pciutils.scm,
  gnu/packages/python.scm, gnu/packages/qt.scm,
  gnu/packages/rsync.scm, gnu/packages/sawfish.scm,
  gnu/packages/scheme.scm, gnu/packages/ssh.scm,
  gnu/packages/statistics.scm, gnu/packages/texlive.scm,
  gnu/packages/wdiff.scm: Adjust accordingly.

Merge branch 'core-updates'.

gnu: Add snakemake.

* gnu/packages/python.scm (snakemake): New variable.

gnu: Add Scikit-learn.

* gnu/packages/python.scm (python-scikit-learn, python2-scikit-learn): New
  variables.

gnu: Add pyyaml.

* gnu/packages/python.scm (python-pyyaml, python2-pyyaml): New variables.

Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/gnupg.scm

gnu: Add 'file-name' fields for github source tarballs without a name.

* gnu/packages/aarddict.scm (aarddict), gnu/packages/algebra.scm (arb),
  gnu/packages/audio.scm (jack-2, lvtk),
  gnu/packages/bioinformatics.scm (bedops, bedtools, bowtie),
  gnu/packages/game-development.scm (tiled),
  gnu/packages/games.scm (minetest-data, minetest, retroarch),
  gnu/packages/jrnl.scm (jrnl), gnu/packages/kde.scm (qjson),
  gnu/packages/libevent.scm (libuv), gnu/packages/linux.scm (pflask),
  gnu/packages/mail.scm (offlineimap, libetpan),
  gnu/packages/maths.scm (arpack-ng), gnu/packages/ninja.scm (ninja),
  gnu/packages/nutrition.scm (gourmet),
  gnu/packages/python.scm (python-cairocffi), gnu/packages/rdf.scm (lrdf),
  gnu/packages/ruby.scm (ruby-i18n), gnu/packages/sxiv.scm (sxiv): Add
  'file-name' field to origin.

gnu: python: Drop special handling of python2-numpydoc as input.

* gnu/packages/python.scm (python2-numpy, python2-matplotlib,
  python2-ipython): Keep input python2-numpydoc created by
  package-with-python2.

gnu: python-numpydoc: Drop one test.

* gnu/packages/python.scm (python-numpydoc): Drop one test for all Python
  versions.
  (python2-numpydoc): Define it by package-with-python2 without modifications.

gnu: python2-py2cairo: Rename to python2-pycairo.

* gnu/packages/gtk.scm (python2-py2cairo): Rename to ...
  (python2-pycairo): ... this
  (python2-pygtk): Adapt input.
* gnu/packages/glib.scm (python2-pygobject-2): Adapt input.
* gnu/packages/python.scm (package-with-python2): Adapt input.

gnu: Remove now unneeded 'localedef' invocations.

This is a followup to commit b0fd2bd.

* gnu/packages/gawk.scm (gawk)[arguments] <install-locales>: Add comment
  on why we leave this here.
* gnu/packages/guile.scm (guile-ncurses)[arguments]: Remove
  'install-locales' phase.
* gnu/packages/swig.scm (swig)[arguments]: Likewise.
* gnu/packages/python.scm (python-matplotlib): Remove 'LOCPATH' setting
  and 'localedef' invocation.
  (python-scipy): Likewise.

gnu: Remove now unneeded 'unpack' phases for unzip.

This is a followup to commit cd0385b.

* gnu/packages/bioinformatics.scm (hisat)[arguments]: Remove 'unpack'
  phase.
* gnu/packages/image.scm (freeimage): Likewise.
* gnu/packages/python.scm (python2-cssutils): Likewise.

Merge branch 'master' into core-updates

gnu: python-html5lib: Add propagated input.

* gnu/packages/python.scm (python-html5lib): Add propagated input python-six.
  (python2-html5lib): Add propagated input python2-six.

gnu: Add python2-six.

* gnu/packages/python.scm (python2-six): New variable.

gnu: python2-oauthlib: Drop inherited fields.

* gnu/packages/python.scm (python2-oauthlib): Drop inherited fields.

gnu: python-scipy: install UTF-8 locale.

* gnu/packages/python.scm (python-scipy): Install en_US.UTF-8 locale in
  install-doc phase to avoid encoding error.

gnu: matplotlib: install UTF-8 locale.

* gnu/packages/python.scm (python-matplotlib): Install en_US.UTF-8 locale in
  install-doc phase to avoid encoding error.

gnu: python-setuptools: Update to 12.1.

*  gnu/packages/python.scm (python-setuptools, python2-setuptools):
     Update to 12.1.