[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Wed, 10 Jun 2015 22:45:06 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 14928016556300a6763334d4279c3d117902caaf
Merge: 1511e02 57cd353
Author: Mark H Weaver <address@hidden>
Date: Wed Jun 10 17:50:27 2015 -0400
Merge branch 'master' into core-updates
.dir-locals.el | 4 +-
.gitignore | 4 +
HACKING | 15 +-
Makefile.am | 9 +-
NEWS | 372 +++++++
README | 16 +-
THANKS | 1 +
build-aux/check-final-inputs-self-contained.scm | 2 +-
build-aux/hydra/gnu-system.scm | 8 +-
build-aux/hydra/guix.scm | 33 +-
build-aux/make-binary-tarball.scm | 3 -
config-daemon.ac | 5 +-
configure.ac | 7 +-
daemon.am | 8 +-
doc.am | 56 +-
doc/emacs.texi | 87 ++-
doc/guix.texi | 1024 ++++++++++++++++----
emacs.am | 1 +
emacs/guix-base.el | 27 +
emacs/guix-list.el | 42 +-
emacs/guix-main.scm | 3 +-
emacs/guix-pcomplete.el | 392 ++++++++
emacs/guix-utils.el | 33 +-
gnu-system.am | 44 +-
gnu/artwork.scm | 4 +-
gnu/build/activation.scm | 39 +-
gnu/build/install.scm | 16 +-
gnu/build/linux-boot.scm | 1 -
gnu/packages/admin.scm | 26 +-
gnu/packages/apr.scm | 25 +-
gnu/packages/audio.scm | 145 +++-
gnu/packages/autogen.scm | 8 +-
gnu/packages/bioinformatics.scm | 313 ++++++-
gnu/packages/busybox.scm | 5 +-
gnu/packages/calendar.scm | 52 +
gnu/packages/cdrom.scm | 8 +-
gnu/packages/check.scm | 9 +-
gnu/packages/commencement.scm | 24 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/curl.scm | 7 +-
gnu/packages/databases.scm | 83 +-
gnu/packages/dejagnu.scm | 4 +-
gnu/packages/disk.scm | 28 +
gnu/packages/ebook.scm | 7 +-
gnu/packages/emacs.scm | 192 ++++-
gnu/packages/feh.scm | 4 +-
gnu/packages/fltk.scm | 35 +-
gnu/packages/freedesktop.scm | 128 +++-
gnu/packages/ftp.scm | 8 +-
gnu/packages/game-development.scm | 43 +-
gnu/packages/games.scm | 75 ++-
gnu/packages/gcc.scm | 87 +-
gnu/packages/gdb.scm | 4 +-
gnu/packages/gimp.scm | 7 +-
gnu/packages/gl.scm | 55 +-
gnu/packages/glib.scm | 5 +-
gnu/packages/gnome.scm | 405 +++++++--
gnu/packages/gnu-pw-mgr.scm | 13 +-
gnu/packages/gnucash.scm | 72 ++
gnu/packages/gnupg.scm | 10 +-
gnu/packages/gnutls.scm | 10 +-
gnu/packages/gnuzilla.scm | 16 +-
gnu/packages/gstreamer.scm | 4 +
gnu/packages/gtk.scm | 42 +-
gnu/packages/guile.scm | 117 ++-
gnu/packages/haskell.scm | 7 +-
gnu/packages/ibus.scm | 2 +-
gnu/packages/icu4c.scm | 4 +-
gnu/packages/image.scm | 8 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/java.scm | 16 +-
gnu/packages/kde.scm | 2 +-
gnu/packages/libedit.scm | 2 +-
gnu/packages/libreoffice.scm | 753 ++++++++++++++-
gnu/packages/libusb.scm | 11 +-
gnu/packages/linux.scm | 84 ++-
gnu/packages/m4.scm | 11 +-
gnu/packages/mail.scm | 48 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 163 +++-
gnu/packages/messaging.scm | 7 +-
gnu/packages/moe.scm | 6 +-
gnu/packages/networking.scm | 107 ++
gnu/packages/ocaml.scm | 328 ++++++-
gnu/packages/openldap.scm | 20 +-
gnu/packages/package-management.scm | 22 +-
gnu/packages/parallel.scm | 4 +-
.../patches/bitlbee-configure-doc-fix.patch | 15 +
.../curl-support-capath-on-gnutls-conf.patch | 16 -
.../patches/curl-support-capath-on-gnutls.patch | 102 --
gnu/packages/patches/fltk-shared-lib-defines.patch | 51 +
gnu/packages/patches/fuse-CVE-2015-3202.patch | 65 ++
gnu/packages/patches/gcc-5.0-libvtv-runpath.patch | 15 +
.../patches/gnutls-fix-duplicate-manpages.patch | 30 -
gnu/packages/patches/guix-test-networking.patch | 15 -
gnu/packages/patches/hop-linker-flags.patch | 60 ++
gnu/packages/patches/inetutils-syslogd.patch | 20 -
gnu/packages/patches/libtool-skip-tests.patch | 55 --
.../patches/linux-libre-libreboot-fix.patch | 37 -
gnu/packages/patches/maxima-defsystem-mkdir.patch | 13 +
.../patches/python-sqlite-3.8.4-test-fix.patch | 15 -
gnu/packages/patches/qemu-CVE-2015-3209.patch | 49 +
gnu/packages/patches/qemu-CVE-2015-3456.patch | 85 ++
gnu/packages/patches/r-fix-15899.patch | 17 +
gnu/packages/patches/rsem-makefile.patch | 682 +++++++++++++
gnu/packages/patches/serf-comment-style-fix.patch | 23 +
.../patches/serf-deflate-buckets-test-fix.patch | 69 ++
.../patches/subversion-sqlite-3.8.9-fix.patch | 59 ++
gnu/packages/patches/tvtime-gcc41.patch | 58 ++
gnu/packages/patches/tvtime-pngoutput.patch | 15 +
gnu/packages/patches/tvtime-videodev2.patch | 15 +
gnu/packages/patches/tvtime-xmltv.patch | 28 +
gnu/packages/patches/udev-gir-libtool.patch | 17 -
.../patches/wicd-template-instantiation.patch | 29 +
.../patches/wpa-supplicant-2015-2-fix.patch | 51 +
.../patches/wpa-supplicant-2015-3-fix.patch | 43 +
.../patches/wpa-supplicant-2015-4-fix-pt1.patch | 75 ++
.../patches/wpa-supplicant-2015-4-fix-pt2.patch | 68 ++
.../patches/wpa-supplicant-2015-4-fix-pt3.patch | 54 +
.../patches/wpa-supplicant-2015-4-fix-pt4.patch | 52 +
.../patches/wpa-supplicant-2015-4-fix-pt5.patch | 34 +
gnu/packages/pcre.scm | 6 +-
gnu/packages/pdf.scm | 4 +-
gnu/packages/perl.scm | 45 +-
gnu/packages/python.scm | 337 ++++++--
gnu/packages/qemu.scm | 11 +-
gnu/packages/rdf.scm | 6 +-
gnu/packages/ruby.scm | 197 ++++
gnu/packages/scheme.scm | 66 +-
gnu/packages/search.scm | 25 +
gnu/packages/socat.scm | 55 --
gnu/packages/statistics.scm | 3 +-
gnu/packages/task-management.scm | 61 ++
gnu/packages/tcsh.scm | 18 +-
gnu/packages/textutils.scm | 50 +-
gnu/packages/tor.scm | 7 +-
gnu/packages/tv.scm | 64 ++
gnu/packages/version-control.scm | 26 +-
gnu/packages/video.scm | 6 +-
gnu/packages/vpn.scm | 31 +
gnu/packages/web.scm | 70 ++
gnu/packages/webkit.scm | 53 +-
gnu/packages/wicd.scm | 8 +-
gnu/packages/wxwidgets.scm | 3 +
gnu/packages/xfce.scm | 32 +
gnu/packages/xml.scm | 33 +-
gnu/services/avahi.scm | 2 +-
gnu/services/base.scm | 19 +-
gnu/services/colord.scm | 72 --
gnu/services/databases.scm | 121 +++
gnu/services/dbus.scm | 127 ---
gnu/services/desktop.scm | 300 ++++++
gnu/services/networking.scm | 34 +-
gnu/services/upower.scm | 122 ---
gnu/services/xorg.scm | 73 ++-
gnu/system.scm | 101 ++-
.../{os-config.tmpl => examples/bare-bones.tmpl} | 28 +-
gnu/system/examples/desktop.tmpl | 44 +
gnu/system/grub.scm | 3 +-
gnu/system/install.scm | 43 +-
gnu/system/nss.scm | 23 +
gnu/system/shadow.scm | 46 +-
guix/base32.scm | 21 +-
guix/build-system/cmake.scm | 1 +
guix/build-system/glib-or-gtk.scm | 1 +
guix/build-system/gnu.scm | 6 +-
guix/build-system/haskell.scm | 1 +
guix/build-system/perl.scm | 1 +
guix/build-system/python.scm | 1 +
guix/build-system/ruby.scm | 1 +
guix/build-system/waf.scm | 1 +
guix/build/download.scm | 27 +-
guix/build/profiles.scm | 149 +++
guix/build/syscalls.scm | 32 +-
guix/ftp-client.scm | 5 +-
guix/gexp.scm | 33 +-
guix/gnu-maintenance.scm | 78 +-
guix/http-client.scm | 93 +--
guix/import/cabal.scm | 815 ++++++++++++++++
guix/import/hackage.scm | 703 ++------------
guix/licenses.scm | 6 +
guix/monads.scm | 73 +-
guix/packages.scm | 53 +-
guix/profiles.scm | 235 ++++-
guix/records.scm | 190 ++--
guix/scripts/authenticate.scm | 8 +-
guix/scripts/build.scm | 59 +-
guix/scripts/environment.scm | 94 +-
guix/scripts/gc.scm | 34 +-
guix/scripts/import.scm | 1 +
guix/scripts/import/hackage.scm | 66 +-
guix/scripts/lint.scm | 75 ++-
guix/scripts/package.scm | 247 +++---
guix/scripts/publish.scm | 97 ++-
guix/scripts/substitute.scm | 29 +-
guix/scripts/system.scm | 82 +-
guix/search-paths.scm | 193 ++++
guix/serialization.scm | 16 +-
guix/store.scm | 39 +-
guix/tests.scm | 10 +-
guix/ui.scm | 150 +++-
guix/utils.scm | 28 -
m4/guix.m4 | 39 +
nix/guix-register/guix-register.cc | 16 +-
nix/libstore/build.cc | 462 +++++----
nix/libstore/gc.cc | 75 +-
nix/libstore/globals.cc | 92 ++-
nix/libstore/globals.hh | 26 +-
nix/libstore/local-store.cc | 111 +--
nix/libstore/local-store.hh | 21 +-
nix/libstore/optimise-store.cc | 17 +
nix/libstore/pathlocks.cc | 2 +-
nix/libstore/remote-store.cc | 48 +-
nix/libstore/remote-store.hh | 34 +-
nix/libstore/store-api.hh | 28 +-
nix/libstore/worker-protocol.hh | 3 +-
nix/libutil/archive.cc | 171 ++--
nix/libutil/archive.hh | 12 +-
nix/libutil/hash.cc | 101 +--
nix/libutil/serialise.cc | 27 +
nix/libutil/serialise.hh | 11 +-
nix/libutil/types.hh | 17 +-
nix/libutil/util.cc | 216 +++--
nix/libutil/util.hh | 36 +-
nix/nix-daemon/guix-daemon.cc | 126 ++-
nix/nix-daemon/nix-daemon.cc | 159 ++--
po/guix/Makevars | 8 +-
po/guix/POTFILES.in | 2 +
po/guix/da.po | 641 ++++++++-----
po/packages/POTFILES.in | 30 +-
tests/base32.scm | 10 +-
tests/derivations.scm | 8 +-
tests/gexp.scm | 10 +
tests/guix-archive.sh | 3 +-
tests/guix-build.sh | 82 ++
tests/guix-gc.sh | 20 +
tests/guix-package-net.sh | 2 +-
tests/guix-package.sh | 37 +-
tests/guix-register.sh | 46 +-
tests/guix-system.sh | 65 ++
tests/hackage.scm | 88 +-
tests/monads.scm | 26 +-
tests/packages.scm | 30 +
tests/profiles.scm | 107 ++
tests/store.scm | 54 +
tests/utils.scm | 3 +-
247 files changed, 13248 insertions(+), 3988 deletions(-)
diff --cc gnu-system.am
index d4631d6,978e839..206c876
--- a/gnu-system.am
+++ b/gnu-system.am
@@@ -416,9 -418,10 +418,11 @@@ dist_patch_DATA =
gnu/packages/patches/emacs-exec-path.patch \
gnu/packages/patches/eudev-rules-directory.patch \
gnu/packages/patches/findutils-absolute-paths.patch \
+ gnu/packages/patches/findutils-localstatedir.patch \
gnu/packages/patches/flashrom-use-libftdi1.patch \
gnu/packages/patches/flex-bison-tests.patch \
+ gnu/packages/patches/fltk-shared-lib-defines.patch \
+ gnu/packages/patches/fuse-CVE-2015-3202.patch \
gnu/packages/patches/gawk-shell.patch \
gnu/packages/patches/gcc-arm-link-spec-fix.patch \
gnu/packages/patches/gcc-cross-environment-variables.patch \
@@@ -542,8 -546,8 +548,9 @@@
gnu/packages/patches/slim-config.patch \
gnu/packages/patches/slim-sigusr1.patch \
gnu/packages/patches/soprano-find-clucene.patch \
+ gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch \
gnu/packages/patches/superlu-dist-scotchmetis.patch \
+ gnu/packages/patches/tar-d_ino_in_dirent-fix.patch \
gnu/packages/patches/tcsh-fix-autotest.patch \
gnu/packages/patches/teckit-cstdio.patch \
gnu/packages/patches/texi2html-document-encoding.patch \
diff --cc gnu/packages/xml.scm
index 97781ad,8a4d2fb..59b73d2
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -1,8 -1,7 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
- ;;; Copyright © 2013 Andreas Enge <address@hidden>
+ ;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
+;;; Copyright © 2015 Sou Bunnbu <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;