[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Leo Famulari |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Sat, 22 Apr 2017 18:30:29 -0400 (EDT) |
lfam pushed a commit to branch staging
in repository guix.
commit 1524851f58d8d69f6c6e1c6406cf174083bbe82d
Merge: 0802f3a ed9fb46
Author: Leo Famulari <address@hidden>
Date: Sat Apr 22 18:27:12 2017 -0400
Merge branch 'master' into staging
.dir-locals.el | 1 +
.mailmap | 13 +-
Makefile.am | 7 +-
doc/guix.texi | 181 ++-
gnu/local.mk | 38 +-
gnu/packages/admin.scm | 18 +-
gnu/packages/android.scm | 300 ++++
gnu/packages/audio.scm | 8 +-
gnu/packages/autotools.scm | 31 +-
gnu/packages/base.scm | 17 +
gnu/packages/bioinformatics.scm | 12 +-
gnu/packages/build-tools.scm | 30 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/crypto.scm | 4 +-
gnu/packages/curl.scm | 14 +
gnu/packages/emacs.scm | 14 +-
gnu/packages/fontutils.scm | 22 +
gnu/packages/freedesktop.scm | 50 +-
gnu/packages/games.scm | 84 +-
gnu/packages/gnome.scm | 25 +-
gnu/packages/gnunet.scm | 6 +-
gnu/packages/gnuzilla.scm | 281 ++--
gnu/packages/gstreamer.scm | 6 +-
gnu/packages/guile.scm | 4 +-
gnu/packages/hurd.scm | 48 +-
gnu/packages/ibus.scm | 24 +-
gnu/packages/icu4c.scm | 3 +-
gnu/packages/image-viewers.scm | 42 +
gnu/packages/image.scm | 4 +-
gnu/packages/irc.scm | 20 +-
gnu/packages/linux.scm | 12 +-
gnu/packages/mail.scm | 73 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/messaging.scm | 15 +-
gnu/packages/moreutils.scm | 12 +-
gnu/packages/networking.scm | 20 +-
gnu/packages/openldap.scm | 37 +-
gnu/packages/package-management.scm | 27 +-
.../patches/ceph-disable-cpu-optimizations.patch | 21 +-
gnu/packages/patches/fabric-tests.patch | 15 +
.../patches/gcc-libiberty-printf-decl.patch | 28 -
gnu/packages/patches/graphite2-CVE-2017-5436.patch | 25 +
.../patches/graphite2-check-code-point-limit.patch | 50 +
.../graphite2-fix-32-bit-wrap-arounds.patch | 93 ++
.../graphite2-non-linear-classes-even-number.patch | 26 +
gnu/packages/patches/grub-CVE-2015-8370.patch | 45 -
gnu/packages/patches/grub-freetype.patch | 24 -
gnu/packages/patches/grub-gets-undeclared.patch | 42 -
gnu/packages/patches/guile-arm-fixes.patch | 203 ---
.../hurd-fix-eth-multiplexer-dependency.patch | 26 +
gnu/packages/patches/hypre-doc-tables.patch | 25 -
gnu/packages/patches/hypre-ldflags.patch | 9 -
.../patches/icecat-avoid-bundled-libraries.patch | 37 +-
gnu/packages/patches/icecat-binutils.patch | 40 -
gnu/packages/patches/icecat-bug-1299500-pt10.patch | 1639 ++++++++++++++++++++
gnu/packages/patches/icu4c-CVE-2014-6585.patch | 21 -
gnu/packages/patches/icu4c-CVE-2015-1270.patch | 15 -
gnu/packages/patches/icu4c-CVE-2015-4760.patch | 189 ---
.../icu4c-CVE-2017-7867-CVE-2017-7868.patch | 164 ++
gnu/packages/patches/libbase-fix-includes.patch | 71 +
gnu/packages/patches/libbase-use-own-logging.patch | 80 +
gnu/packages/patches/mplayer2-theora-fix.patch | 286 ----
.../patches/nss-disable-long-b64-tests.patch | 34 +
...policycoreutils-make-sepolicy-use-python3.patch | 335 ++++
.../patches/portaudio-audacity-compat.patch | 60 +-
.../python-pyopenssl-skip-network-test.patch | 25 +-
gnu/packages/patches/qemu-CVE-2016-10155.patch | 49 -
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-5856.patch | 68 -
gnu/packages/patches/qemu-CVE-2017-5898.patch | 44 -
gnu/packages/patches/soprano-find-clucene.patch | 15 -
.../patches/util-linux-CVE-2017-2616.patch | 65 -
.../patches/xf86-video-intel-compat-api.patch | 13 -
.../patches/xf86-video-intel-glibc-2.20.patch | 15 -
gnu/packages/python.scm | 40 +-
gnu/packages/qemu.scm | 13 +-
gnu/packages/rust.scm | 56 +-
gnu/packages/sdl.scm | 4 +-
gnu/packages/selinux.scm | 481 ++++++
gnu/packages/serialization.scm | 25 +-
gnu/packages/ssh.scm | 24 +-
gnu/packages/statistics.scm | 69 +-
gnu/packages/suckless.scm | 46 +-
gnu/packages/tls.scm | 5 +
gnu/packages/tmux.scm | 5 +-
gnu/packages/upnp.scm | 20 +-
gnu/packages/version-control.scm | 94 +-
gnu/packages/video.scm | 5 +-
gnu/packages/web.scm | 4 +-
gnu/packages/xorg.scm | 23 +-
gnu/services/base.scm | 50 +-
gnu/services/mail.scm | 52 +-
gnu/services/web.scm | 7 +-
gnu/system.scm | 14 +-
gnu/system/vm.scm | 2 +-
gnu/tests/mail.scm | 135 +-
guix/build/download.scm | 7 +
guix/cache.scm | 113 ++
guix/derivations.scm | 35 +-
guix/gexp.scm | 33 +-
guix/scripts/copy.scm | 41 +-
guix/scripts/offload.scm | 14 +-
guix/scripts/publish.scm | 259 +++-
guix/scripts/substitute.scm | 97 +-
guix/ssh.scm | 83 +-
guix/store.scm | 122 +-
guix/store/ssh.scm | 39 +
guix/tests.scm | 6 +-
guix/workers.scm | 123 ++
tests/cache.scm | 88 ++
tests/derivations.scm | 14 +
tests/gexp.scm | 4 +
tests/guix-build.sh | 8 +
tests/publish.scm | 54 +
tests/scripts-build.scm | 7 +-
tests/store.scm | 8 +
tests/workers.scm | 45 +
121 files changed, 5830 insertions(+), 2192 deletions(-)
diff --cc gnu/packages/xorg.scm
index 88181e1,212586f..b9589dc
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -5105,13 -5114,16 +5105,16 @@@ communicates with the user via graphica
draggable titlebars and borders.")
(license license:x11)))
- ;;; This package is intended to be used when building GTK+.
+ ;; This package is intended to be used when building GTK+.
+ ;; Note: It's currently marked as "hidden" to avoid having two non-eq?
+ ;; packages with the same name and version.
-(define-public xorg-server-1.19.2
+(define-public xorg-server-1.19.3
- (package
- (inherit xorg-server)
- (name "xorg-server")
- (version "1.19.3")
- (source
+ (hidden-package
+ (package
+ (inherit xorg-server)
+ (name "xorg-server")
- (version "1.19.2")
++ (version "1.19.3")
+ (source
(origin
(method url-fetch)
(uri (string-append