Merge branch 'core-updates' Conflicts: gnu/packages/bootstrap.scm
packages: Add 'file-type' field to 'search-path-specification'. Fixes <http://bugs.gnu.org/18033>. * guix/packages.scm (<search-path-specification>): Rename 'directories' field to 'files'. Add 'file-type'. (search-path-specification->sexp): Honor 'file-type'. * gnu/packages/autotools.scm, gnu/packages/bootstrap.scm, gnu/packages/cross-base.scm, gnu/packages/games.scm, gnu/packages/gcc.scm, gnu/packages/glib.scm, gnu/packages/guile.scm, gnu/packages/man.scm, gnu/packages/perl.scm, gnu/packages/pkg-config.scm, gnu/packages/python.scm, gnu/packages/ruby.scm, gnu/packages/xfce.scm: Change 'directories' to 'files'. * tests/packages.scm ("search paths"): Change 'directories' field to 'files'. * guix/scripts/environment.scm (for-each-search-path): Likewise.
Merge branch 'master' into core-updates
Merge branch 'master' into xorg-updates
gnu: Add xfce4-terminal. * gnu/packages/xfce.scm (xfce4-terminal): New variable.
gnu: Add xfce4-battery-plugin. * gnu/packages/xfce.scm (xfce4-battery-plugin): New variable.
gnu: xfce4-panel: Support panel plugins from other packages. * gnu/packages/patches/xfce4-panel-plugins.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/xfce.scm (xfce4-panel): Add the patch, and a native search path specification for X_XFCE4_LIB_DIRS.
Merge branch 'master' into 'core-updates'.
gnu: xfconf: Disable parallel tests. * gnu/packages/xfce.scm (xfconf): Add 'arguments' field.
gnu: Add xfdesktop. * gnu/packages/xfce.scm (xfdesktop): New variable.
gnu: Add xfwm4. * gnu/packages/xfce.scm (xfwm4): New variable.
gnu: Add thunar-volman. * gnu/packages/xfce.scm (thunar-volman): New variable.
gnu: Add thunar. * gnu/packages/xfce.scm (thunar): New variable.
gnu: Add xfce4-settings. * gnu/packages/xfce.scm (xfce4-settings): New variable.
gnu: Add xfce4-session. * gnu/packages/xfce.scm (xfce4-session): New variable.
gnu: Add xfce4-appfinder. * gnu/packages/xfce.scm (xfce4-appfinder): New variable.
gnu: Add xfce4-panel. * gnu/packages/xfce.scm (xfce4-panel): New variable.
gnu: Add tumbler. * gnu/packages/xfce.scm (tumbler): New variable.
gnu: Add garcon. * gnu/packages/xfce.scm (garcon): New variable.
gnu: Add exo. * gnu/packages/xfce.scm (exo): New variable.