[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into wip-installer
|
From: |
John Darrington |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into wip-installer |
|
Date: |
Mon, 13 Feb 2017 16:02:34 -0500 (EST) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit c2eaa7737fc0178c4d01c7666d4b7f346c0a5ced
Merge: 25c91ad 85bc543
Author: John Darrington <address@hidden>
Date: Mon Feb 13 22:02:02 2017 +0100
Merge remote-tracking branch 'origin/master' into wip-installer
Conflicts:
gnu/system/install.scm
.dir-locals.el | 2 +
.gitignore | 1 +
.mailmap | 11 +-
HACKING | 4 +-
Makefile.am | 7 +-
README | 2 +-
config-daemon.ac | 1 +
configure.ac | 9 +
doc/contributing.texi | 14 +-
doc/guix.texi | 386 +++++++++-
etc/completion/bash/guix | 24 +-
etc/git/pre-push | 22 +-
etc/indent-code.el.in | 52 ++
gnu/build/activation.scm | 62 +-
gnu/build/file-systems.scm | 33 +-
gnu/build/linux-container.scm | 40 +-
gnu/build/shepherd.scm | 177 +++++
gnu/local.mk | 63 +-
gnu/packages.scm | 34 +-
gnu/packages/admin.scm | 135 +++-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 8 +-
gnu/packages/backup.scm | 28 +-
gnu/packages/bash.scm | 49 +-
gnu/packages/benchmark.scm | 39 +-
gnu/packages/bioinformatics.scm | 622 +++++++++++++++-
gnu/packages/bittorrent.scm | 91 ++-
gnu/packages/bootloaders.scm | 332 +++++++++
gnu/packages/bootstrap.scm | 39 +-
gnu/packages/calendar.scm | 5 +-
gnu/packages/cdrom.scm | 6 +-
gnu/packages/check.scm | 4 +-
gnu/packages/ci.scm | 7 +-
gnu/packages/code.scm | 32 +-
gnu/packages/compression.scm | 133 +++-
gnu/packages/compton.scm | 106 +++
gnu/packages/crypto.scm | 38 +-
gnu/packages/cups.scm | 9 +
gnu/packages/cyrus-sasl.scm | 4 +-
gnu/packages/databases.scm | 264 ++++++-
gnu/packages/datamash.scm | 4 +-
gnu/packages/disk.scm | 18 +-
gnu/packages/dns.scm | 16 +-
gnu/packages/emacs.scm | 283 ++++++-
gnu/packages/engineering.scm | 1 -
gnu/packages/fcitx.scm | 36 +
gnu/packages/finance.scm | 51 ++
gnu/packages/firmware.scm | 136 +++-
gnu/packages/fonts.scm | 249 ++++++-
gnu/packages/freedesktop.scm | 13 +-
gnu/packages/ftp.scm | 18 +-
gnu/packages/games.scm | 243 ++++--
gnu/packages/gcal.scm | 6 +-
gnu/packages/gd.scm | 29 +-
gnu/packages/gdb.scm | 4 +-
gnu/packages/geo.scm | 93 ++-
gnu/packages/ghostscript.scm | 9 +
gnu/packages/gimp.scm | 2 +-
gnu/packages/gl.scm | 6 +-
gnu/packages/glib.scm | 70 +-
gnu/packages/gnome.scm | 555 ++++++++++----
gnu/packages/gnucash.scm | 4 +-
gnu/packages/gnunet.scm | 36 +-
gnu/packages/gnupg.scm | 85 +--
gnu/packages/gnuzilla.scm | 41 +-
gnu/packages/grub.scm | 161 ----
gnu/packages/gsasl.scm | 2 +-
gnu/packages/gstreamer.scm | 30 +-
gnu/packages/gtk.scm | 86 +--
gnu/packages/guile.scm | 132 ++--
gnu/packages/haskell.scm | 90 ++-
gnu/packages/image-viewers.scm | 59 ++
gnu/packages/image.scm | 6 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 20 +-
gnu/packages/java.scm | 34 +-
gnu/packages/kde.scm | 21 +-
gnu/packages/kerberos.scm | 187 +++++
gnu/packages/ldc.scm | 210 +++++-
gnu/packages/libevent.scm | 44 +-
gnu/packages/libidn.scm | 7 +-
gnu/packages/libupnp.scm | 6 +-
gnu/packages/linux.scm | 218 +++++-
gnu/packages/lua.scm | 65 +-
gnu/packages/lxde.scm | 23 +-
gnu/packages/mail.scm | 229 +++++-
gnu/packages/mate.scm | 2 +-
gnu/packages/maths.scm | 129 +++-
gnu/packages/messaging.scm | 156 +++-
gnu/packages/mg.scm | 46 +-
gnu/packages/mit-krb5.scm | 86 ---
gnu/packages/mpd.scm | 8 +-
gnu/packages/mtools.scm | 4 +-
gnu/packages/music.scm | 168 +++--
gnu/packages/networking.scm | 73 +-
gnu/packages/nfs.scm | 2 +-
gnu/packages/node.scm | 2 +-
gnu/packages/ocaml.scm | 815 ++++++++++++++++++++-
gnu/packages/onc-rpc.scm | 4 +-
gnu/packages/openbox.scm | 37 +
gnu/packages/orpheus.scm | 2 +-
gnu/packages/package-management.scm | 47 +-
gnu/packages/parallel.scm | 8 +-
gnu/packages/password-utils.scm | 25 +-
.../patches/duplicity-piped-password.patch | 20 -
.../patches/duplicity-test_selection-tmp.patch | 18 -
...dont-pass-linker-flags-via-response-files.patch | 27 +
.../gnupg-test-segfault-on-32bit-arch.patch | 40 -
.../gst-plugins-base-fix-test-on-32bit.patch | 32 +
gnu/packages/patches/httpd-CVE-2016-8740.patch | 36 -
.../patches/khal-disable-failing-tests.patch | 33 -
.../patches/lcms-fix-out-of-bounds-read.patch | 34 +
.../patches/ldc-1.1.0-disable-dmd-tests.patch | 35 +
.../patches/ldc-1.1.0-disable-phobos-tests.patch | 414 +++++++++++
...event-2.0-evdns-fix-remote-stack-overread.patch | 42 ++
...t-2.0-evdns-fix-searching-empty-hostnames.patch | 40 +
.../libevent-2.0-evutil-fix-buffer-overflow.patch | 42 ++
gnu/packages/patches/libevent-2.1-dns-tests.patch | 26 +
.../patches/libevent-2.1-skip-failing-test.patch | 24 +
gnu/packages/patches/libtiff-CVE-2017-5225.patch | 86 +++
gnu/packages/patches/libupnp-CVE-2016-6255.patch | 50 --
gnu/packages/patches/libupnp-CVE-2016-8863.patch | 72 --
gnu/packages/patches/libvpx-CVE-2016-2818.patch | 21 +-
.../patches/mupdf-mujs-CVE-2016-10132.patch | 188 +++++
.../patches/mupdf-mujs-CVE-2016-10133.patch | 36 +
gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch | 42 ++
.../patches/omake-fix-non-determinism.patch | 41 ++
.../openjpeg-CVE-2016-9572-CVE-2016-9573.patch | 233 ++++++
gnu/packages/patches/p7zip-CVE-2016-9296.patch | 24 +
gnu/packages/patches/qemu-CVE-2016-10155.patch | 49 ++
gnu/packages/patches/qemu-CVE-2017-2615.patch | 52 ++
gnu/packages/patches/qemu-CVE-2017-5525.patch | 55 ++
gnu/packages/patches/qemu-CVE-2017-5526.patch | 58 ++
gnu/packages/patches/qemu-CVE-2017-5552.patch | 44 ++
gnu/packages/patches/qemu-CVE-2017-5578.patch | 39 +
gnu/packages/patches/qemu-CVE-2017-5579.patch | 44 ++
gnu/packages/patches/qemu-CVE-2017-5667.patch | 46 ++
gnu/packages/patches/qemu-CVE-2017-5856.patch | 68 ++
gnu/packages/patches/qemu-CVE-2017-5898.patch | 44 ++
gnu/packages/patches/qemu-CVE-2017-5931.patch | 55 ++
gnu/packages/patches/screen-CVE-2017-5618.patch | 40 +
.../patches/shadow-4.4-su-snprintf-fix.patch | 31 +
.../slurm-configure-remove-nonfree-contribs.patch | 22 +-
gnu/packages/patches/spice-CVE-2016-9577.patch | 33 +
gnu/packages/patches/spice-CVE-2016-9578-1.patch | 33 +
gnu/packages/patches/spice-CVE-2016-9578-2.patch | 38 +
gnu/packages/patches/totem-debug-format-fix.patch | 11 -
gnu/packages/patches/upower-builddir.patch | 2 +-
.../patches/vsearch-unbundle-cityhash.patch | 73 ++
.../patches/xf86-video-glint-remove-mibstore.patch | 24 -
.../patches/xf86-video-nv-remove-mibstore.patch | 72 --
gnu/packages/patches/xinetd-CVE-2013-4342.patch | 36 +
gnu/packages/patches/xinetd-fix-fd-leak.patch | 26 +
gnu/packages/pdf.scm | 36 +-
gnu/packages/perl.scm | 4 +-
gnu/packages/photo.scm | 12 +-
gnu/packages/plotutils.scm | 4 +-
gnu/packages/polkit.scm | 26 +
gnu/packages/popt.scm | 14 +-
gnu/packages/python.scm | 436 +++++++++--
gnu/packages/qemu.scm | 15 +-
gnu/packages/rdesktop.scm | 73 +-
gnu/packages/re2c.scm | 47 ++
gnu/packages/regex.scm | 7 +-
gnu/packages/ruby.scm | 46 +-
gnu/packages/rust.scm | 3 +
gnu/packages/scheme.scm | 1 -
gnu/packages/screen.scm | 10 +-
gnu/packages/sdl.scm | 42 +-
gnu/packages/search.scm | 34 +-
gnu/packages/security-token.scm | 6 +-
gnu/packages/serialization.scm | 86 ++-
gnu/packages/shells.scm | 66 +-
gnu/packages/shellutils.scm | 4 +-
gnu/packages/shishi.scm | 70 --
gnu/packages/simh.scm | 96 +++
gnu/packages/spice.scm | 26 +-
gnu/packages/ssh.scm | 4 +-
gnu/packages/statistics.scm | 203 ++++-
gnu/packages/suckless.scm | 45 +-
gnu/packages/sync.scm | 48 ++
gnu/packages/telephony.scm | 11 +-
gnu/packages/terminals.scm | 68 ++
gnu/packages/text-editors.scm | 102 ++-
gnu/packages/tls.scm | 63 +-
gnu/packages/tor.scm | 86 ++-
gnu/packages/tv.scm | 8 +-
gnu/packages/u-boot.scm | 136 ----
gnu/packages/version-control.scm | 76 +-
gnu/packages/video.scm | 99 ++-
gnu/packages/vim.scm | 84 ++-
gnu/packages/web.scm | 122 ++-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wget.scm | 8 +-
gnu/packages/wine.scm | 4 +-
gnu/packages/wm.scm | 71 +-
gnu/packages/xdisorg.scm | 22 +-
gnu/packages/xiph.scm | 4 +-
gnu/packages/xorg.scm | 91 ++-
gnu/services.scm | 36 +-
gnu/services/base.scm | 194 ++---
gnu/services/cuirass.scm | 16 +-
gnu/services/cups.scm | 2 +
gnu/services/mail.scm | 2 +
gnu/services/messaging.scm | 6 +-
gnu/services/networking.scm | 379 +++++++---
gnu/services/shepherd.scm | 2 +
gnu/services/spice.scm | 5 +-
gnu/services/ssh.scm | 3 +
gnu/services/vpn.scm | 75 +-
gnu/services/web.scm | 97 ++-
gnu/system.scm | 5 +-
gnu/system/examples/bare-bones.tmpl | 2 +-
gnu/system/examples/desktop.tmpl | 2 +-
gnu/system/examples/lightweight-desktop.tmpl | 2 +-
gnu/system/file-systems.scm | 94 ++-
gnu/system/grub.scm | 8 +-
gnu/system/install.scm | 4 +-
gnu/system/linux-container.scm | 21 +-
gnu/system/mapped-devices.scm | 2 +-
gnu/system/shadow.scm | 38 +-
gnu/system/vm.scm | 2 +-
gnu/tests/base.scm | 119 ++-
gnu/tests/install.scm | 65 +-
gnu/tests/messaging.scm | 194 +++++
gnu/tests/web.scm | 146 ++++
guix/build-system/dub.scm | 147 ++++
guix/build-system/gnu.scm | 51 +-
guix/build-system/python.scm | 89 ++-
guix/build/bournish.scm | 11 +-
guix/build/dub-build-system.scm | 125 ++++
guix/build/r-build-system.scm | 3 +-
guix/build/syscalls.scm | 137 +++-
guix/combinators.scm | 18 +-
guix/derivations.scm | 89 ++-
guix/download.scm | 43 +-
guix/git-download.scm | 43 +-
guix/gnu-maintenance.scm | 111 +--
guix/grafts.scm | 58 +-
guix/import/cran.scm | 4 +-
guix/import/elpa.scm | 3 +-
guix/import/github.scm | 14 +-
guix/import/hackage.scm | 24 +-
guix/import/json.scm | 3 +-
guix/import/pypi.scm | 19 +-
guix/import/stackage.scm | 135 ++++
guix/memoization.scm | 114 +++
guix/modules.scm | 25 +-
guix/packages.scm | 70 +-
guix/profiles.scm | 27 +-
guix/scripts/build.scm | 15 +-
guix/scripts/container/exec.scm | 13 +-
guix/scripts/copy.scm | 4 +-
guix/scripts/environment.scm | 33 +-
guix/scripts/graph.scm | 15 +-
guix/scripts/import.scm | 3 +-
guix/scripts/import/stackage.scm | 115 +++
guix/scripts/lint.scm | 25 +-
guix/scripts/refresh.scm | 1 +
guix/serialization.scm | 12 +-
guix/store.scm | 37 +-
guix/utils.scm | 11 +-
nix/libstore/builtins.cc | 6 +
tests/bournish.scm | 12 +
tests/containers.scm | 27 +
tests/cpan.scm | 2 +-
tests/crate.scm | 2 +-
tests/file-systems.scm | 32 +-
tests/gem.scm | 2 +-
tests/grafts.scm | 118 ++-
tests/guix-environment.sh | 7 +-
tests/pypi.scm | 20 +-
tests/store.scm | 5 +
tests/syscalls.scm | 23 +-
274 files changed, 13759 insertions(+), 2994 deletions(-)
diff --cc gnu/system/install.scm
index 05e6caa,3ec3435..08c047f
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@@ -28,13 -28,11 +28,13 @@@
#:use-module (gnu services shepherd)
#:use-module (gnu packages admin)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages bootloaders)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages pciutils)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages package-management)
#:use-module (gnu packages disk)
- #:use-module (gnu packages grub)
+ #:use-module (gnu packages guile)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages compression)
#:use-module (gnu packages nvi)