99 files changed, 22291 insertions(+), 343 deletions(-)

D .gitmodules
M bootstrap
M doc/guix.texi
M gnu-system.am
M gnu/packages.scm
M gnu/packages/bioinformatics.scm
M gnu/packages/compression.scm
A gnu/packages/game-development.scm
M gnu/packages/ghostscript.scm
M gnu/packages/gnome.scm
M gnu/packages/gnuzilla.scm
M gnu/packages/groff.scm
M gnu/packages/linux.scm
M gnu/packages/ntp.scm
A gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch
A gnu/packages/patches/icecat-CVE-2014-1587-bug-1072847.patch
A gnu/packages/patches/icecat-CVE-2014-1587-bug-1079729.patch
A gnu/packages/patches/icecat-CVE-2014-1587-bug-1080312.patch
A gnu/packages/patches/icecat-CVE-2014-1587-bug-1089207.patch
A gnu/packages/patches/icecat-CVE-2014-1590.patch
A gnu/packages/patches/icecat-CVE-2014-1592.patch
A gnu/packages/patches/icecat-CVE-2014-1593.patch
A gnu/packages/patches/icecat-CVE-2014-1594.patch
A gnu/packages/patches/xfce4-panel-plugins.patch
M gnu/packages/perl.scm
M gnu/packages/python.scm
M gnu/packages/qemu.scm
M gnu/packages/tmux.scm
M gnu/packages/video.scm
M gnu/packages/xdisorg.scm
M gnu/packages/xfce.scm
M gnu/services/base.scm
M gnu/services/networking.scm
M gnu/services/xorg.scm
M gnu/system/install.scm
M guix/build-system/python.scm
M guix/build/python-build-system.scm
M guix/build/syscalls.scm
M guix/packages.scm
M guix/profiles.scm
D nix-upstream
A nix/AUTHORS
A nix/COPYING
A nix/boost/assert.hpp
A nix/boost/format.hpp
A nix/boost/format/exceptions.hpp
A nix/boost/format/feed_args.hpp
A nix/boost/format/format_class.hpp
A nix/boost/format/format_fwd.hpp
A nix/boost/format/format_implementation.cc
A nix/boost/format/free_funcs.cc
A nix/boost/format/group.hpp
A nix/boost/format/internals.hpp
A nix/boost/format/internals_fwd.hpp
A nix/boost/format/macros_default.hpp
A nix/boost/format/parsing.cc
A nix/boost/throw_exception.hpp
A nix/libstore/build.cc
A nix/libstore/derivations.cc
A nix/libstore/derivations.hh
A nix/libstore/gc.cc
A nix/libstore/globals.cc
A nix/libstore/globals.hh
A nix/libstore/local-store.cc
A nix/libstore/local-store.hh
A nix/libstore/misc.cc
A nix/libstore/misc.hh
A nix/libstore/optimise-store.cc
A nix/libstore/pathlocks.cc
A nix/libstore/pathlocks.hh
A nix/libstore/references.cc
A nix/libstore/references.hh
A nix/libstore/remote-store.cc
A nix/libstore/remote-store.hh
A nix/libstore/schema.sql
A nix/libstore/store-api.cc
A nix/libstore/store-api.hh
A nix/libstore/worker-protocol.hh
A nix/libutil/affinity.cc
A nix/libutil/affinity.hh
A nix/libutil/archive.cc
A nix/libutil/archive.hh
A nix/libutil/hash.cc
A nix/libutil/hash.hh
A nix/libutil/serialise.cc
A nix/libutil/serialise.hh
A nix/libutil/types.hh
A nix/libutil/util.cc
A nix/libutil/util.hh
A nix/libutil/xml-writer.cc
A nix/libutil/xml-writer.hh
A nix/nix-daemon/nix-daemon.cc
D nix/sync-with-upstream
M po/guix/LINGUAS
A po/guix/fr.po
M po/packages/LINGUAS
A po/packages/fr.po
M tests/profiles.scm
M tests/syscalls.scm