[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Mon, 22 May 2017 08:57:55 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit e4cddbbcac752090585baed5b15e2eb4af713284
Merge: 98bb983 7429723
Author: Marius Bakke <address@hidden>
Date: Mon May 22 14:56:50 2017 +0200
Merge branch 'master' into staging
.dir-locals.el | 1 +
Makefile.am | 37 +-
build-aux/hydra/gnu-system.scm | 2 +-
doc/guix.texi | 177 ++-
gnu.scm | 4 +-
gnu/bootloader.scm | 127 ++
gnu/bootloader/extlinux.scm | 120 ++
gnu/{system => bootloader}/grub.scm | 184 ++-
gnu/build/activation.scm | 9 +-
gnu/build/install.scm | 36 +-
gnu/build/vm.scm | 127 +-
gnu/local.mk | 21 +-
gnu/packages/admin.scm | 60 +-
gnu/packages/aspell.scm | 18 +-
gnu/packages/aux-files/linux-libre/4.11-i686.conf | 3 +-
.../aux-files/linux-libre/4.11-x86_64.conf | 3 +-
gnu/packages/backup.scm | 15 +-
gnu/packages/base.scm | 121 +-
gnu/packages/benchmark.scm | 8 +-
gnu/packages/bioinformatics.scm | 102 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/ebook.scm | 72 +-
gnu/packages/emacs.scm | 113 +-
gnu/packages/engineering.scm | 3 +-
gnu/packages/games.scm | 26 +-
gnu/packages/ghostscript.scm | 1 +
gnu/packages/gnome.scm | 54 +
gnu/packages/gnupg.scm | 12 +-
gnu/packages/icu4c.scm | 29 +
gnu/packages/image-processing.scm | 130 ++
gnu/packages/image.scm | 5 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/java.scm | 1250 ++++++++++++++++++--
gnu/packages/kde-frameworks.scm | 302 ++---
gnu/packages/libusb.scm | 100 +-
gnu/packages/linux.scm | 27 +-
gnu/packages/lisp.scm | 159 ++-
gnu/packages/logging.scm | 15 +
gnu/packages/mail.scm | 4 +-
gnu/packages/mc.scm | 8 +-
gnu/packages/mes.scm | 27 +-
gnu/packages/music.scm | 51 +
gnu/packages/nano.scm | 4 +-
gnu/packages/package-management.scm | 19 +-
gnu/packages/patches/aspell-default-dict-dir.patch | 20 +
.../patches/calibre-dont-load-remote-icons.patch | 45 +
gnu/packages/patches/calibre-drop-unrar.patch | 48 +-
.../patches/calibre-use-packaged-feedparser.patch | 51 +
gnu/packages/patches/gspell-dash-test.patch | 16 +
gnu/packages/patches/guile-ssh-double-free.patch | 37 +
gnu/packages/patches/guile-ssh-rexec-bug.patch | 16 +
gnu/packages/patches/jbig2dec-CVE-2017-7885.patch | 38 +
gnu/packages/patches/jbig2dec-CVE-2017-7975.patch | 40 +
gnu/packages/patches/jbig2dec-CVE-2017-7976.patch | 122 ++
...networkmanager-qt-activeconnection-test-1.patch | 60 -
...networkmanager-qt-activeconnection-test-2.patch | 57 -
gnu/packages/patches/qemu-CVE-2017-7493.patch | 182 +++
gnu/packages/patches/qtscript-disable-tests.patch | 64 +
.../patches/ruby-concurrent-test-arm.patch | 26 +-
.../patches/shadow-4.4-su-snprintf-fix.patch | 31 -
gnu/packages/patches/shadow-CVE-2017-2616.patch | 72 --
gnu/packages/php.scm | 10 +-
gnu/packages/python.scm | 4 +-
gnu/packages/qemu.scm | 1 +
gnu/packages/qt.scm | 162 +--
gnu/packages/ruby.scm | 12 +-
gnu/packages/security-token.scm | 12 +-
gnu/packages/shells.scm | 37 +
gnu/packages/ssh.scm | 8 +-
gnu/packages/sssd.scm | 173 +++
gnu/packages/textutils.scm | 76 +-
gnu/packages/tls.scm | 7 +-
gnu/packages/tor.scm | 6 +-
gnu/packages/video.scm | 27 +-
gnu/packages/vim.scm | 8 +-
gnu/packages/web.scm | 32 +
gnu/packages/xml.scm | 31 +
gnu/services/base.scm | 3 +-
gnu/services/pm.scm | 41 +-
gnu/services/ssh.scm | 2 +-
gnu/system.scm | 28 +-
gnu/system/examples/lightweight-desktop.tmpl | 30 +-
gnu/system/examples/vm-image.tmpl | 53 +
gnu/system/install.scm | 12 +
gnu/system/linux-initrd.scm | 4 +-
gnu/system/vm.scm | 60 +-
gnu/tests.scm | 3 +-
gnu/tests/base.scm | 22 +
gnu/tests/nfs.scm | 3 +-
guix/build-system/asdf.scm | 109 +-
guix/build/asdf-build-system.scm | 182 ++-
guix/build/lisp-utils.scm | 384 +++---
guix/build/union.scm | 43 +-
guix/download.scm | 3 -
guix/import/cran.scm | 101 +-
guix/licenses.scm | 6 +
guix/modules.scm | 11 +-
guix/profiles.scm | 18 +-
guix/scripts/lint.scm | 3 +-
guix/scripts/pack.scm | 11 +-
guix/scripts/publish.scm | 3 +-
guix/scripts/system.scm | 236 ++--
guix/ui.scm | 7 +
guix/utils.scm | 2 +-
tests/profiles.scm | 29 +
tests/publish.scm | 71 +-
106 files changed, 5098 insertions(+), 1507 deletions(-)