[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge remote-tracking branch 'origin/master' into wip-installer
|
From: |
John Darrington |
|
Subject: |
01/03: Merge remote-tracking branch 'origin/master' into wip-installer |
|
Date: |
Sun, 15 Jan 2017 18:58:21 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 1e3a91655de63629d3ed3cf3e7a9858f19e561ea
Merge: ac6599d d9da3a7
Author: John Darrington <address@hidden>
Date: Sun Jan 15 16:46:22 2017 +0100
Merge remote-tracking branch 'origin/master' into wip-installer
.gitignore | 1 +
HACKING | 5 +
Makefile.am | 7 +-
configure.ac | 5 +
doc/contributing.texi | 28 +-
doc/guix.texi | 862 +++++++++++++++++++-
doc/local.mk | 3 +-
etc/git/pre-push | 57 ++
etc/indent-code.el.in | 62 ++
gnu/build/file-systems.scm | 318 +++++---
gnu/local.mk | 36 +-
gnu/packages/abiword.scm | 9 +-
gnu/packages/admin.scm | 14 +-
gnu/packages/algebra.scm | 18 +-
gnu/packages/astronomy.scm | 4 +-
gnu/packages/audacity.scm | 14 +-
gnu/packages/audio.scm | 15 +-
gnu/packages/backup.scm | 35 +
gnu/packages/base.scm | 3 +
gnu/packages/bioinformatics.scm | 174 +++-
gnu/packages/bittorrent.scm | 9 +-
gnu/packages/c.scm | 34 +-
gnu/packages/calendar.scm | 1 +
gnu/packages/ci.scm | 16 +-
gnu/packages/code.scm | 4 +-
gnu/packages/commencement.scm | 4 +-
gnu/packages/compression.scm | 6 +-
gnu/packages/connman.scm | 49 +-
gnu/packages/cross-base.scm | 2 +-
gnu/packages/cups.scm | 14 +-
gnu/packages/dav.scm | 4 +-
gnu/packages/display-managers.scm | 2 +-
gnu/packages/django.scm | 4 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/ebook.scm | 6 +-
gnu/packages/education.scm | 56 +-
gnu/packages/emacs.scm | 50 +-
gnu/packages/engineering.scm | 13 +-
gnu/packages/enlightenment.scm | 8 +-
gnu/packages/fonts.scm | 149 ++--
gnu/packages/freedesktop.scm | 78 +-
gnu/packages/games.scm | 6 +-
gnu/packages/gcc.scm | 9 +-
gnu/packages/ghostscript.scm | 2 +-
gnu/packages/gimp.scm | 5 +-
gnu/packages/gl.scm | 4 +
gnu/packages/gnome.scm | 22 +-
gnu/packages/gnucash.scm | 10 +-
gnu/packages/gnupg.scm | 46 +-
gnu/packages/gnuzilla.scm | 73 +-
gnu/packages/gtk.scm | 52 +-
gnu/packages/guile.scm | 148 +++-
gnu/packages/gv.scm | 23 +-
gnu/packages/haskell.scm | 243 +++---
gnu/packages/hurd.scm | 7 +-
gnu/packages/idris.scm | 256 ++++++
gnu/packages/image-viewers.scm | 5 +-
gnu/packages/image.scm | 32 +-
gnu/packages/imagemagick.scm | 7 +-
gnu/packages/inkscape.scm | 32 +-
gnu/packages/irc.scm | 20 +-
gnu/packages/kde-frameworks.scm | 4 +-
gnu/packages/libreoffice.scm | 13 +-
...bre-4.8-i686.conf => linux-libre-4.9-i686.conf} | 208 +++--
...4.8-x86_64.conf => linux-libre-4.9-x86_64.conf} | 216 +++--
gnu/packages/linux.scm | 159 +++-
gnu/packages/lisp.scm | 4 +-
gnu/packages/llvm.scm | 3 +-
gnu/packages/lynx.scm | 4 +-
gnu/packages/mail.scm | 6 +-
gnu/packages/make-bootstrap.scm | 4 -
gnu/packages/maths.scm | 4 +-
gnu/packages/messaging.scm | 47 +-
gnu/packages/mp3.scm | 6 +-
gnu/packages/mtools.scm | 3 +-
gnu/packages/music.scm | 22 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 6 +-
gnu/packages/nim.scm | 59 ++
gnu/packages/ocaml.scm | 669 +++++++++++++--
gnu/packages/onc-rpc.scm | 2 +-
gnu/packages/package-management.scm | 8 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 25 +-
.../chicken-CVE-2016-6830+CVE-2016-6831.patch | 81 ++
.../patches/cracklib-fix-buffer-overflow.patch | 39 +
.../patches/inkscape-drop-wait-for-targets.patch | 68 --
.../patches/khal-disable-failing-tests.patch | 33 +
gnu/packages/patches/libtiff-CVE-2016-10092.patch | 42 +
gnu/packages/patches/libtiff-CVE-2016-10093.patch | 53 ++
gnu/packages/patches/libtiff-CVE-2016-10094.patch | 34 +
.../patches/libtiff-assertion-failure.patch | 60 ++
.../patches/libtiff-divide-by-zero-ojpeg.patch | 63 ++
.../patches/libtiff-divide-by-zero-tiffcp.patch | 104 +++
.../patches/libtiff-divide-by-zero-tiffcrop.patch | 57 ++
gnu/packages/patches/libtiff-divide-by-zero.patch | 67 ++
.../libtiff-heap-overflow-pixarlog-luv.patch | 131 +++
.../libtiff-heap-overflow-tif-dirread.patch | 132 +++
.../patches/libtiff-heap-overflow-tiffcp.patch | 67 ++
.../patches/libtiff-heap-overflow-tiffcrop.patch | 60 ++
gnu/packages/patches/libtiff-invalid-read.patch | 64 ++
.../patches/libtiff-null-dereference.patch | 42 +
.../patches/libtiff-tiffcp-underflow.patch | 41 +
gnu/packages/patches/libxt-guix-search-paths.patch | 126 +++
gnu/packages/patches/mcrypt-CVE-2012-4409.patch | 35 +-
gnu/packages/patches/mcrypt-CVE-2012-4527.patch | 198 +++--
.../patches/ocaml-Add-a-.file-directive.patch | 96 +++
...ml-bisect-fix-camlp4-in-another-directory.patch | 125 +++
.../patches/ocaml-bitstring-fix-configure.patch | 53 ++
.../patches/python-pycrypto-CVE-2013-7459.patch | 97 +++
.../python-pygpgme-fix-pinentry-tests.patch | 69 ++
.../ruby-yard-fix-skip-of-markdown-tests.patch | 17 -
gnu/packages/patches/slock-CVE-2016-6866.patch | 51 --
gnu/packages/patches/tipp10-fix-compiling.patch | 213 +++++
.../patches/tipp10-remove-license-code.patch | 332 ++++++++
gnu/packages/patches/unrtf-CVE-2016-10091.patch | 189 +++++
gnu/packages/pdf.scm | 9 +-
gnu/packages/perl.scm | 27 +-
gnu/packages/python.scm | 175 +++-
gnu/packages/qemu.scm | 3 +-
gnu/packages/qt.scm | 269 +++++-
gnu/packages/ruby.scm | 113 ++-
gnu/packages/rust.scm | 75 +-
gnu/packages/scheme.scm | 29 +-
gnu/packages/sdl.scm | 15 +-
gnu/packages/search.scm | 4 +-
gnu/packages/security-token.scm | 6 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/shellutils.scm | 6 +-
gnu/packages/speech.scm | 34 +
gnu/packages/statistics.scm | 46 +-
gnu/packages/suckless.scm | 450 +++++++++-
gnu/packages/terminals.scm | 38 +-
gnu/packages/tls.scm | 28 +-
gnu/packages/unrtf.scm | 2 +
gnu/packages/upnp.scm | 11 +-
gnu/packages/version-control.scm | 14 +-
gnu/packages/video.scm | 26 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/vpn.scm | 7 +-
gnu/packages/web.scm | 4 +-
gnu/packages/xdisorg.scm | 6 +-
gnu/packages/xfce.scm | 7 +-
gnu/packages/xfig.scm | 155 ++--
gnu/packages/xorg.scm | 387 ++++-----
gnu/packages/zile.scm | 82 +-
gnu/services/configuration.scm | 3 +
gnu/services/databases.scm | 81 +-
gnu/services/messaging.scm | 726 +++++++++++++++++
gnu/services/networking.scm | 9 +-
gnu/services/vpn.scm | 491 +++++++++++
gnu/services/web.scm | 96 ++-
gnu/system/grub.scm | 17 +-
gnu/system/linux-initrd.scm | 6 +
gnu/tests/install.scm | 77 +-
guix/build-system/cargo.scm | 3 +-
guix/build-system/ocaml.scm | 181 ++++
guix/build/make-bootstrap.scm | 5 +-
guix/build/ocaml-build-system.scm | 119 +++
guix/derivations.scm | 58 +-
guix/docker.scm | 127 +++
guix/git-download.scm | 15 +-
guix/grafts.scm | 90 +-
guix/http-client.scm | 33 +-
guix/import/github.scm | 17 +-
guix/licenses.scm | 10 +-
guix/scripts/archive.scm | 33 +-
guix/scripts/build.scm | 7 +-
guix/scripts/challenge.scm | 185 +++--
guix/scripts/graph.scm | 21 +
guix/scripts/hash.scm | 5 +-
guix/scripts/package.scm | 7 +-
guix/scripts/perform-download.scm | 37 +-
guix/store.scm | 34 +-
guix/ui.scm | 60 +-
guix/utils.scm | 10 +-
nix/libstore/build.cc | 15 +-
nix/libstore/builtins.cc | 10 +-
nix/libstore/builtins.hh | 5 +-
nix/libstore/worker-protocol.hh | 2 +-
nix/nix-daemon/guix-daemon.cc | 5 +-
nix/nix-daemon/nix-daemon.cc | 16 +-
tests/challenge.scm | 62 +-
tests/derivations.scm | 27 +-
tests/graph.scm | 14 +-
tests/guix-daemon.sh | 29 +-
tests/guix-package.sh | 10 +-
tests/store.scm | 27 +-
188 files changed, 10392 insertions(+), 1933 deletions(-)
diff --cc gnu/local.mk
index 39cc0d4,81d774e..05e729a
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -7,9 -7,8 +7,9 @@@
# Copyright © 2016 Kei Kebreau <address@hidden>
# Copyright © 2016 Rene Saavedra <address@hidden>
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira
<https://libreplanet.org/wiki/User:Adfeno> <address@hidden>
- # Copyright © 2016 Ricardo Wurmus <address@hidden>
+ # Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
# Copyright © 2016 Ben Woodcroft <address@hidden>
+# Copyright © 2016, 2017 John Darrington <address@hidden>
#
# This file is part of GNU Guix.
#