~ruther/guix-local

86a81222cad9841c67e9d9bcd46c567383e9a34f — 宋文武 10 years ago 3e3d47f + 8605321
Merge branch 'master' into gtk-rebuild

Conflicts:
	gnu/packages/gtk.scm
365 files changed, 27757 insertions(+), 4169 deletions(-)

M .dir-locals.el
M .gitignore
M AUTHORS
M Makefile.am
M NEWS
M README
M THANKS
M build-aux/check-available-binaries.scm
M build-aux/check-final-inputs-self-contained.scm
M build-aux/hydra/gnu-system.scm
M build-aux/hydra/guix.scm
M build-aux/list-packages.scm
A build-aux/make-binary-tarball.scm
M config-daemon.ac
M configure.ac
M daemon.am
M doc.am
M doc/guix.texi
A etc/completion/bash/guix
M gnu-system.am
M gnu/artwork.scm
M gnu/build/activation.scm
M gnu/build/file-systems.scm
M gnu/build/install.scm
M gnu/packages.scm
M gnu/packages/admin.scm
M gnu/packages/apl.scm
M gnu/packages/apr.scm
A gnu/packages/audacity.scm
M gnu/packages/audio.scm
M gnu/packages/autogen.scm
M gnu/packages/autotools.scm
M gnu/packages/base.scm
M gnu/packages/bash.scm
M gnu/packages/bioinformatics.scm
M gnu/packages/boost.scm
M gnu/packages/bootstrap/i686-linux/bash
M gnu/packages/bootstrap/i686-linux/mkdir
M gnu/packages/bootstrap/i686-linux/tar
M gnu/packages/bootstrap/i686-linux/xz
M gnu/packages/bootstrap/x86_64-linux/bash
M gnu/packages/bootstrap/x86_64-linux/mkdir
M gnu/packages/bootstrap/x86_64-linux/tar
M gnu/packages/bootstrap/x86_64-linux/xz
M gnu/packages/busybox.scm
A gnu/packages/calendar.scm
M gnu/packages/cdrom.scm
M gnu/packages/certs.scm
M gnu/packages/check.scm
M gnu/packages/cmake.scm
M gnu/packages/code.scm
M gnu/packages/commencement.scm
M gnu/packages/compression.scm
M gnu/packages/cross-base.scm
M gnu/packages/cups.scm
M gnu/packages/curl.scm
M gnu/packages/databases.scm
M gnu/packages/dejagnu.scm
M gnu/packages/dictionaries.scm
M gnu/packages/disk.scm
M gnu/packages/ebook.scm
M gnu/packages/ed.scm
M gnu/packages/elf.scm
M gnu/packages/emacs.scm
M gnu/packages/engineering.scm
M gnu/packages/enlightenment.scm
A gnu/packages/fcitx.scm
M gnu/packages/feh.scm
M gnu/packages/fltk.scm
M gnu/packages/freedesktop.scm
M gnu/packages/ftp.scm
M gnu/packages/game-development.scm
M gnu/packages/games.scm
M gnu/packages/gcc.scm
M gnu/packages/gd.scm
M gnu/packages/gdb.scm
M gnu/packages/gettext.scm
M gnu/packages/ghostscript.scm
M gnu/packages/gimp.scm
M gnu/packages/gl.scm
M gnu/packages/glib.scm
M gnu/packages/gnome.scm
A gnu/packages/gnucash.scm
M gnu/packages/gnunet.scm
M gnu/packages/gnupg.scm
M gnu/packages/gnutls.scm
M gnu/packages/gnuzilla.scm
M gnu/packages/graphics.scm
M gnu/packages/gstreamer.scm
M gnu/packages/gtk.scm
M gnu/packages/guile.scm
M gnu/packages/haskell.scm
M gnu/packages/hurd.scm
A gnu/packages/ibus.scm
M gnu/packages/icu4c.scm
M gnu/packages/image.scm
M gnu/packages/imagemagick.scm
M gnu/packages/java.scm
R gnu/packages/{ocrad => jemalloc}.scm
A gnu/packages/julia.scm
M gnu/packages/kde.scm
M gnu/packages/key-mon.scm
R gnu/packages/{ld-wrapper.scm => ld-wrapper.in}
M gnu/packages/libedit.scm
M gnu/packages/libidn.scm
A gnu/packages/libreoffice.scm
M gnu/packages/libusb.scm
M gnu/packages/linux-libre-i686.conf
M gnu/packages/linux-libre-x86_64.conf
M gnu/packages/linux.scm
A gnu/packages/lirc.scm
M gnu/packages/lisp.scm
M gnu/packages/lsh.scm
M gnu/packages/lsof.scm
M gnu/packages/m4.scm
M gnu/packages/mail.scm
M gnu/packages/man.scm
M gnu/packages/maths.scm
M gnu/packages/messaging.scm
M gnu/packages/moe.scm
M gnu/packages/music.scm
M gnu/packages/nano.scm
M gnu/packages/ncurses.scm
M gnu/packages/netpbm.scm
M gnu/packages/nettle.scm
R gnu/packages/{socat => networking}.scm
M gnu/packages/node.scm
M gnu/packages/ntp.scm
A gnu/packages/ocr.scm
M gnu/packages/openldap.scm
M gnu/packages/openssl.scm
M gnu/packages/package-management.scm
M gnu/packages/parallel.scm
A gnu/packages/patches/audacity-fix-ffmpeg-binding.patch
A gnu/packages/patches/bitlbee-configure-doc-fix.patch
A gnu/packages/patches/calibre-no-updates-dialog.patch
M gnu/packages/patches/cmake-fix-tests.patch
D gnu/packages/patches/curl-gss-api-fix.patch
A gnu/packages/patches/elfutils-tests-ptrace.patch
A gnu/packages/patches/emacs-exec-path.patch
A gnu/packages/patches/fltk-shared-lib-defines.patch
A gnu/packages/patches/fuse-CVE-2015-3202.patch
A gnu/packages/patches/gcc-5.0-libvtv-runpath.patch
A gnu/packages/patches/gcc-arm-link-spec-fix.patch
A gnu/packages/patches/gcc-libvtv-runpath.patch
A gnu/packages/patches/geoclue-config.patch
A gnu/packages/patches/ghostscript-runpath.patch
A gnu/packages/patches/gitolite-openssh-6.8-compat.patch
A gnu/packages/patches/gnutls-fix-duplicate-manpages.patch
M gnu/packages/patches/gobject-introspection-cc.patch
D gnu/packages/patches/gstreamer-0.10-bison3.patch
D gnu/packages/patches/gstreamer-0.10-silly-test.patch
D gnu/packages/patches/guix-test-networking.patch
A gnu/packages/patches/hop-linker-flags.patch
A gnu/packages/patches/icecat-CVE-2015-0797.patch
A gnu/packages/patches/icecat-CVE-2015-2708-pt1.patch
A gnu/packages/patches/icecat-CVE-2015-2708-pt2.patch
A gnu/packages/patches/icecat-CVE-2015-2708-pt3.patch
A gnu/packages/patches/icecat-CVE-2015-2708-pt4.patch
A gnu/packages/patches/icecat-CVE-2015-2710-pt1.patch
A gnu/packages/patches/icecat-CVE-2015-2710-pt2.patch
A gnu/packages/patches/icecat-CVE-2015-2710-pt3.patch
A gnu/packages/patches/icecat-CVE-2015-2713-pt1.patch
A gnu/packages/patches/icecat-CVE-2015-2713-pt2.patch
A gnu/packages/patches/icecat-CVE-2015-2716.patch
D gnu/packages/patches/librep-rules.mk.patch
R gnu/packages/patches/{libtool-skip-tests => libtool-skip-tests2}.patch
A gnu/packages/patches/lirc-localstatedir.patch
A gnu/packages/patches/mplayer2-theora-fix.patch
A gnu/packages/patches/openssl-runpath.patch
A gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch
A gnu/packages/patches/perl-module-pluggable-search.patch
A gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch
A gnu/packages/patches/portaudio-audacity-compat.patch
A gnu/packages/patches/pulseaudio-longer-test-timeout.patch
A gnu/packages/patches/pycairo-wscript.patch
M gnu/packages/patches/python-fix-tests.patch
D gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch
A gnu/packages/patches/qemu-CVE-2015-3456.patch
A gnu/packages/patches/qt4-ldflags.patch
A gnu/packages/patches/qt5-conflicting-typedefs.patch
A gnu/packages/patches/qt5-runpath.patch
A gnu/packages/patches/r-fix-15899.patch
A gnu/packages/patches/rsem-makefile.patch
A gnu/packages/patches/serf-comment-style-fix.patch
A gnu/packages/patches/serf-deflate-buckets-test-fix.patch
D gnu/packages/patches/source-highlight-regexrange-test.patch
A gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch
A gnu/packages/patches/tvtime-gcc41.patch
A gnu/packages/patches/tvtime-pngoutput.patch
A gnu/packages/patches/tvtime-videodev2.patch
A gnu/packages/patches/tvtime-xmltv.patch
D gnu/packages/patches/udev-gir-libtool.patch
A gnu/packages/patches/upower-builddir.patch
A gnu/packages/patches/webkitgtk-2.4.8-gmutexlocker.patch
A gnu/packages/patches/wicd-template-instantiation.patch
A gnu/packages/patches/wpa-supplicant-2015-2-fix.patch
A gnu/packages/patches/wpa-supplicant-2015-3-fix.patch
A gnu/packages/patches/wpa-supplicant-2015-4-fix-pt1.patch
A gnu/packages/patches/wpa-supplicant-2015-4-fix-pt2.patch
A gnu/packages/patches/wpa-supplicant-2015-4-fix-pt3.patch
A gnu/packages/patches/wpa-supplicant-2015-4-fix-pt4.patch
A gnu/packages/patches/wpa-supplicant-2015-4-fix-pt5.patch
A gnu/packages/patches/wpa-supplicant-CVE-2015-1863.patch
A gnu/packages/patches/xf86-video-sis-fix-exa-crash.patch
M gnu/packages/pcre.scm
M gnu/packages/pdf.scm
M gnu/packages/perl.scm
M gnu/packages/photo.scm
M gnu/packages/plotutils.scm
M gnu/packages/polkit.scm
M gnu/packages/popt.scm
M gnu/packages/pretty-print.scm
M gnu/packages/pulseaudio.scm
M gnu/packages/python.scm
M gnu/packages/qemu.scm
M gnu/packages/qt.scm
M gnu/packages/rdf.scm
M gnu/packages/ruby.scm
M gnu/packages/samba.scm
M gnu/packages/sawfish.scm
M gnu/packages/scheme.scm
M gnu/packages/sdl.scm
M gnu/packages/search.scm
M gnu/packages/ssh.scm
M gnu/packages/statistics.scm
A gnu/packages/task-management.scm
M gnu/packages/tbb.scm
M gnu/packages/telephony.scm
M gnu/packages/texlive.scm
M gnu/packages/textutils.scm
M gnu/packages/tor.scm
A gnu/packages/tv.scm
M gnu/packages/upnp.scm
M gnu/packages/version-control.scm
M gnu/packages/video.scm
M gnu/packages/vpn.scm
M gnu/packages/web.scm
A gnu/packages/webkit.scm
M gnu/packages/wicd.scm
M gnu/packages/wine.scm
M gnu/packages/wxwidgets.scm
M gnu/packages/xdisorg.scm
M gnu/packages/xfce.scm
M gnu/packages/xiph.scm
M gnu/packages/xml.scm
M gnu/packages/xorg.scm
M gnu/services/avahi.scm
M gnu/services/base.scm
A gnu/services/databases.scm
R gnu/services/{dbus => desktop}.scm
A gnu/services/lirc.scm
M gnu/services/networking.scm
M gnu/services/ssh.scm
M gnu/services/xorg.scm
M gnu/system.scm
R gnu/system/{os-config => examples/bare-bones}.tmpl
A gnu/system/examples/desktop.tmpl
M gnu/system/file-systems.scm
M gnu/system/grub.scm
M gnu/system/install.scm
M gnu/system/linux-initrd.scm
M gnu/system/nss.scm
M gnu/system/vm.scm
M guix/build-system/cmake.scm
M guix/build-system/glib-or-gtk.scm
M guix/build-system/gnu.scm
A guix/build-system/haskell.scm
M guix/build-system/perl.scm
M guix/build-system/python.scm
M guix/build-system/ruby.scm
M guix/build-system/waf.scm
M guix/build/cmake-build-system.scm
M guix/build/download.scm
M guix/build/glib-or-gtk-build-system.scm
M guix/build/gnu-build-system.scm
M guix/build/gnu-dist.scm
A guix/build/gremlin.scm
A guix/build/haskell-build-system.scm
M guix/build/perl-build-system.scm
A guix/build/profiles.scm
M guix/build/python-build-system.scm
M guix/build/ruby-build-system.scm
M guix/build/syscalls.scm
M guix/build/utils.scm
M guix/build/waf-build-system.scm
M guix/cvs-download.scm
M guix/derivations.scm
M guix/download.scm
M guix/elf.scm
M guix/ftp-client.scm
M guix/gexp.scm
M guix/git-download.scm
M guix/gnu-maintenance.scm
M guix/http-client.scm
M guix/import/cpan.scm
A guix/import/hackage.scm
M guix/monads.scm
M guix/packages.scm
M guix/profiles.scm
M guix/records.scm
M guix/scripts/authenticate.scm
M guix/scripts/build.scm
M guix/scripts/environment.scm
M guix/scripts/gc.scm
M guix/scripts/import.scm
A guix/scripts/import/hackage.scm
M guix/scripts/lint.scm
M guix/scripts/package.scm
A guix/scripts/publish.scm
M guix/scripts/refresh.scm
R guix/scripts/{substitute-binary => substitute}.scm
M guix/scripts/system.scm
A guix/search-paths.scm
M guix/serialization.scm
M guix/store.scm
M guix/svn-download.scm
M guix/tests.scm
M guix/ui.scm
M guix/utils.scm
M m4/guix.m4
M nix/libstore/build.cc
M nix/libstore/gc.cc
M nix/libstore/globals.cc
M nix/libstore/globals.hh
M nix/libstore/local-store.cc
M nix/libstore/local-store.hh
M nix/libstore/optimise-store.cc
M nix/libstore/remote-store.cc
M nix/libstore/remote-store.hh
M nix/libstore/store-api.hh
M nix/libstore/worker-protocol.hh
M nix/libutil/archive.cc
M nix/libutil/archive.hh
M nix/libutil/serialise.cc
M nix/libutil/serialise.hh
M nix/libutil/types.hh
M nix/libutil/util.cc
M nix/libutil/util.hh
M nix/nix-daemon/guix-daemon.cc
M nix/nix-daemon/nix-daemon.cc
R nix/scripts/{substitute-binary => substitute}.in
M po/guix/LINGUAS
M po/guix/POTFILES.in
A po/guix/da.po
M po/packages/POTFILES.in
M pre-inst-env.in
M tests/derivations.scm
M tests/gexp.scm
A tests/gremlin.scm
M tests/guix-archive.sh
M tests/guix-build.sh
M tests/guix-daemon.sh
A tests/guix-package-net.sh
M tests/guix-package.sh
M tests/guix-system.sh
A tests/hackage.scm
M tests/lint.scm
M tests/packages.scm
M tests/profiles.scm
A tests/publish.scm
M tests/store.scm
R tests/{substitute-binary => substitute}.scm
M tests/syscalls.scm
M tests/utils.scm
This diff is too large to display. Try viewing the raw diff instead.