Merge branch 'master' into xorg-updates

gnu: qemu: Update to 2.2.0.

* gnu/packages/qemu.scm (qemu): Update to 2.2.0.

gnu: pingus: Add glu to inputs.

* gnu/packages/games.scm (pingus): Add glu to inputs.

gnu: gnubik: Add glu to inputs.

* gnu/packages/games.scm (gnubik): Add glu to inputs.

gnu: gnubg: Add glu to inputs.

* gnu/packages/games.scm (gnubg): Add glu to inputs.

gnu: sdl: Fix incompatibility with libx11-1.6.

* gnu/packages/patches/sdl-libx11-1.6.patch: New file
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/sdl.scm (sdl): Add patch.

gnu: gtkglext: Add glu to inputs.

* gnu/packages/gnome.scm (gtkglext): Add glu to inputs.

gnu: ntp: Update to 4.2.8.

* gnu/packages/ntp.scm (ntp): Update to 4.2.8.  Add openssl to inputs.
  Add pkg-config to native-inputs.  Change source URI to archive.ntp.org.

gnu: ntp: Update to 4.2.8.

* gnu/packages/ntp.scm (ntp): Update to 4.2.8.  Add openssl to inputs.
  Add pkg-config to native-inputs.  Change source URI to archive.ntp.org.

Merge branch 'master' into xorg-updates

Revert "gnu: matplotlib: Comment out python2-matplotlib."

This reverts commit afc720d34c43a2fcf0b5871226c15ad6c5f73697.

build-system/python: Fix 'package-with-explicit-python'.

Reported by Federico Beffa <beffa@ieee.org>
and Eric Bavier <ericbavier@gmail.com>.

* guix/build-system/python.scm (package-with-explicit-python): Do
  nothing when P's build system is not PYTHON-BUILD-SYSTEM.

gnu: matplotlib: Comment out python2-matplotlib.

* gnu/packages/python.scm (python2-matplotlib, python2-scipy, python2-numpy):
  Comment out python2-matplotlib and the packages making use of it as the
  generation of the derivation of these packages takes very long.

Optimize package-transitive-supported-systems.

* guix/packages.scm (first-value): Remove.
  (define-memoized/v): New macro.
  (package-transitive-supported-systems): Rewrite.

packages: Sort Scheme file lists used by 'fold-packages'.

* gnu/packages.scm (scheme-files): Call 'sort' on result.

Merge branch 'master' into xorg-updates

Really remove the 'nix-upstream' submodule.

* nix-upstream: Remove subproject.

gnu: Add xfce4-terminal.

* gnu/packages/xfce.scm (xfce4-terminal): New variable.

gnu: Add vte.

* gnu/packages/gnome.scm (vte, vte/gtk+-2): New variables.

gnu: Consistently use modular xorg source URIs in xorg.scm.

* gnu/packages/xorg.scm (bigreqsproto, compositeproto, damageproto)
  (dmxproto, encodings, font-adobe100dpi, font-adobe75dpi, font-alias)
  (font-arabic-misc, font-cronyx-cyrillic, font-dec-misc, font-isas-misc)
  (font-micro-misc, font-misc-cyrillic, font-misc-ethiopic, font-misc-misc)
  (font-mutt-misc, font-schumacher-misc, font-screen-cyrillic, font-sony-misc)
  (font-sun-misc, font-util, font-winitzki-cyrillic, font-xfree86-type1)
  (libpthread-stubs, libwindowswm, libxdmcp, libxkbfile, libxscrnsaver)
  (luit, recordproto, renderproto, resourceproto, scrnsaverproto, setxkbmap)
  (smproxy, windowswmproto, x11perf, xcb-proto, xcmiscproto, xcmsdb, xdriinfo)
  (xf86-input-void, xf86-video-newport, xf86bigfontproto, xf86dgaproto)
  (xf86driproto, xf86vidmodeproto, xgamma, xineramaproto, xkbevd, xlsatoms)
  (xorg-sgml-doctools, xpr, xwud, fixesproto, mkfontdir, libxcb, xcb-util)
  (xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, kbproto, xbitmaps):
  Use source URIs with prefix mirror://xorg/individual/ for consistency.
  (dri3proto, presentproto, printproto): Remove comments about them not
  being part of X11R7.7.