beffa pushed a commit to branch wip-gobject-introspection in repository guix.
commit c31238d3677ac1426be035cc51da7940448830bc Merge: 518bcfd 3d243e9 Author: Federico Beffa <[email protected]> Date: Mon Jan 12 18:07:50 2015 +0100 Merge branch 'master' into wip-gobject-introspection .gitmodules | 3 - Makefile.am | 13 +- bootstrap | 12 +- build-aux/list-packages.scm | 11 +- config-daemon.ac | 2 +- doc/guix.texi | 41 +- gnu-system.am | 39 +- gnu/build/file-systems.scm | 9 +- gnu/build/linux-boot.scm | 5 +- gnu/packages.scm | 58 +- gnu/packages/algebra.scm | 10 +- gnu/packages/autotools.scm | 32 +- gnu/packages/bioinformatics.scm | 58 + gnu/packages/compression.scm | 20 + gnu/packages/cpio.scm | 15 +- gnu/packages/fltk.scm | 2 +- gnu/packages/fonts.scm | 6 +- gnu/packages/games.scm | 36 +- gnu/packages/gcc.scm | 24 +- gnu/packages/gl.scm | 67 +- gnu/packages/glib.scm | 29 +- gnu/packages/gnome.scm | 141 +- gnu/packages/gnuzilla.scm | 171 +- gnu/packages/gtk.scm | 9 +- gnu/packages/image.scm | 25 +- gnu/packages/inkscape.scm | 21 +- gnu/packages/kde.scm | 2 +- gnu/packages/libcanberra.scm | 31 +- gnu/packages/linux.scm | 4 +- gnu/packages/mail.scm | 5 +- gnu/packages/maths.scm | 1 + gnu/packages/ninja.scm | 87 + gnu/packages/ntp.scm | 34 +- gnu/packages/patches/cpio-CVE-2014-9112-pt1.patch | 231 ++ gnu/packages/patches/cpio-CVE-2014-9112-pt2.patch | 51 + gnu/packages/patches/cpio-CVE-2014-9112-pt3.patch | 23 + gnu/packages/patches/cpio-CVE-2014-9112-pt4.patch | 105 + gnu/packages/patches/cpio-CVE-2014-9112-pt5.patch | 88 + gnu/packages/patches/inkscape-stray-comma.patch | 13 - gnu/packages/patches/irrlicht-mesa-10.patch | 46 + .../libcanberra-sound-theme-freedesktop.patch | 22 + gnu/packages/patches/libtool-2.4-skip-tests.patch | 24 + .../patches/minetest-subgame-env-var.patch | 92 - gnu/packages/patches/mutt-CVE-2014-9116.patch | 46 + gnu/packages/patches/nss-pkgconfig.patch | 225 ++ gnu/packages/patches/sdl-libx11-1.6.patch | 13 + gnu/packages/patches/unzip-CVE-2014-8139.patch | 49 + gnu/packages/patches/unzip-CVE-2014-8140.patch | 27 + gnu/packages/patches/unzip-CVE-2014-8141.patch | 137 + gnu/packages/patches/vtk-mesa-10.patch | 36 + .../patches/xf86-input-synaptics-glibc-2.20.patch | 63 - .../patches/xf86-video-ark-remove-mibstore.patch | 23 + .../patches/xf86-video-ast-remove-mibstore.patch | 90 + .../patches/xf86-video-geode-glibc-2.20.patch | 15 + .../patches/xf86-video-glint-remove-mibstore.patch | 24 + .../patches/xf86-video-i128-remove-mibstore.patch | 23 + .../patches/xf86-video-intel-compat-api.patch | 13 + .../patches/xf86-video-intel-glibc-2.20.patch | 15 + .../patches/xf86-video-mach64-glibc-2.20.patch | 17 + .../patches/xf86-video-mga-glibc-2.20.patch | 17 + .../patches/xf86-video-nv-remove-mibstore.patch | 72 + .../patches/xf86-video-openchrome-glibc-2.20.patch | 15 + .../patches/xf86-video-openchrome-includes.patch | 35 - .../patches/xf86-video-r128-glibc-2.20.patch | 17 + .../xf86-video-siliconmotion-remove-mibstore.patch | 16 + .../patches/xf86-video-sis-update-api.patch | 128 + .../patches/xf86-video-tdfx-remove-mibstore.patch | 26 + .../patches/xf86-video-tga-remove-mibstore.patch | 34 + .../xf86-video-trident-remove-mibstore.patch | 23 + .../patches/xf86-video-vmware-glibc-2.20.patch | 15 + gnu/packages/pdf.scm | 25 +- gnu/packages/perl.scm | 109 + gnu/packages/polkit.scm | 75 +- gnu/packages/popt.scm | 4 +- gnu/packages/python.scm | 268 ++- gnu/packages/qemu.scm | 4 +- gnu/packages/qt.scm | 63 +- gnu/packages/sdl.scm | 4 +- gnu/packages/stalonetray.scm | 2 +- gnu/packages/version-control.scm | 53 +- gnu/packages/video.scm | 8 +- gnu/packages/vtk.scm | 8 +- gnu/packages/xdisorg.scm | 30 +- gnu/packages/xfce.scm | 30 + gnu/packages/xml.scm | 2 +- gnu/packages/xorg.scm | 940 +++--- gnu/packages/zip.scm | 6 +- gnu/services/networking.scm | 72 +- gnu/services/xorg.scm | 75 +- guix/base64.scm | 22 +- guix/build-system/glib-or-gtk.scm | 30 +- guix/build-system/python.scm | 42 +- guix/build/download.scm | 48 +- guix/build/glib-or-gtk-build-system.scm | 138 +- guix/build/python-build-system.scm | 35 +- guix/build/syscalls.scm | 204 ++- guix/derivations.scm | 98 +- guix/hash.scm | 5 + guix/import/cpan.scm | 167 + guix/import/gnu.scm | 7 +- guix/import/json.scm | 32 + guix/import/pypi.scm | 47 +- guix/import/utils.scm | 48 +- guix/packages.scm | 61 +- guix/pk-crypto.scm | 14 +- guix/records.scm | 59 +- guix/scripts/import.scm | 2 +- guix/scripts/import/cpan.scm | 91 + guix/scripts/lint.scm | 121 +- guix/scripts/substitute-binary.scm | 13 +- guix/sets.scm | 116 + guix/tests.scm | 23 +- guix/ui.scm | 16 +- nix-upstream | 1 - nix/AUTHORS | 2 + nix/COPYING | 504 +++ nix/boost/assert.hpp | 38 + nix/boost/format.hpp | 64 + nix/boost/format/exceptions.hpp | 96 + nix/boost/format/feed_args.hpp | 247 ++ nix/boost/format/format_class.hpp | 135 + nix/boost/format/format_fwd.hpp | 49 + nix/boost/format/format_implementation.cc | 256 ++ nix/boost/format/free_funcs.cc | 71 + nix/boost/format/group.hpp | 680 ++++ nix/boost/format/internals.hpp | 167 + nix/boost/format/internals_fwd.hpp | 65 + nix/boost/format/macros_default.hpp | 48 + nix/boost/format/parsing.cc | 454 +++ nix/boost/throw_exception.hpp | 47 + nix/libstore/build.cc | 3352 ++++++++++++++++++++ nix/libstore/derivations.cc | 288 ++ nix/libstore/derivations.hh | 93 + nix/libstore/gc.cc | 748 +++++ nix/libstore/globals.cc | 240 ++ nix/libstore/globals.hh | 218 ++ nix/libstore/local-store.cc | 2037 ++++++++++++ nix/libstore/local-store.hh | 344 ++ nix/libstore/misc.cc | 220 ++ nix/libstore/misc.hh | 38 + nix/libstore/optimise-store.cc | 238 ++ nix/libstore/pathlocks.cc | 199 ++ nix/libstore/pathlocks.hh | 45 + nix/libstore/references.cc | 122 + nix/libstore/references.hh | 11 + nix/libstore/remote-store.cc | 602 ++++ nix/libstore/remote-store.hh | 104 + nix/libstore/schema.sql | 44 + nix/libstore/store-api.cc | 331 ++ nix/libstore/store-api.hh | 366 +++ nix/libstore/worker-protocol.hh | 60 + nix/libutil/affinity.cc | 55 + nix/libutil/affinity.hh | 9 + nix/libutil/archive.cc | 335 ++ nix/libutil/archive.hh | 75 + nix/libutil/hash.cc | 382 +++ nix/libutil/hash.hh | 113 + nix/libutil/serialise.cc | 259 ++ nix/libutil/serialise.hh | 133 + nix/libutil/types.hh | 86 + nix/libutil/util.cc | 1105 +++++++ nix/libutil/util.hh | 351 ++ nix/libutil/xml-writer.cc | 94 + nix/libutil/xml-writer.hh | 69 + nix/nix-daemon/nix-daemon.cc | 939 ++++++ nix/sync-with-upstream | 89 - po/packages/LINGUAS | 1 + po/packages/eo.po | 1107 ++++++- po/packages/fr.po | 1567 +++++++++ tests/{pypi.scm => cpan.scm} | 93 +- tests/derivations.scm | 13 +- tests/guix-package.sh | 23 +- tests/lint.scm | 360 ++- tests/packages.scm | 7 - tests/pypi.scm | 11 +- tests/sets.scm | 52 + tests/syscalls.scm | 34 +- 177 files changed, 24464 insertions(+), 1671 deletions(-)
