[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging' into core-updates
|
From: |
Ricardo Wurmus |
|
Subject: |
01/01: Merge branch 'staging' into core-updates |
|
Date: |
Mon, 13 Aug 2018 14:40:05 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c
Merge: 25bd726 7b38f04
Author: Ricardo Wurmus <address@hidden>
Date: Mon Aug 13 20:39:08 2018 +0200
Merge branch 'staging' into core-updates
doc/guix.texi | 2 +-
gnu/local.mk | 9 +-
gnu/packages/admin.scm | 1 +
gnu/packages/audio.scm | 8 +
gnu/packages/autogen.scm | 16 +-
gnu/packages/backup.scm | 33 +++-
gnu/packages/bioinformatics.scm | 5 +-
gnu/packages/build-tools.scm | 15 +-
gnu/packages/cdrom.scm | 41 +++++
gnu/packages/compression.scm | 12 +-
gnu/packages/curl.scm | 14 +-
gnu/packages/databases.scm | 146 ++++++++++++---
gnu/packages/dns.scm | 4 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs.scm | 3 +-
gnu/packages/finance.scm | 17 +-
gnu/packages/freedesktop.scm | 8 +-
gnu/packages/ftp.scm | 7 +-
gnu/packages/games.scm | 181 +++++++++---------
gnu/packages/gl.scm | 4 +-
gnu/packages/gnome.scm | 37 ++--
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnuzilla.scm | 68 +++++++
gnu/packages/golang.scm | 25 ---
gnu/packages/graphics.scm | 66 +++++++
gnu/packages/gstreamer.scm | 44 +++--
gnu/packages/java.scm | 5 +-
gnu/packages/libreoffice.scm | 8 +-
gnu/packages/linux.scm | 31 ++--
gnu/packages/llvm.scm | 9 +-
gnu/packages/mail.scm | 58 +++++-
gnu/packages/maths.scm | 29 +--
gnu/packages/mes.scm | 28 +--
gnu/packages/messaging.scm | 4 +-
gnu/packages/mingw.scm | 4 +-
gnu/packages/music.scm | 22 +--
gnu/packages/networking.scm | 120 +++++++++++-
gnu/packages/package-management.scm | 8 +-
.../patches/emacs-exwm-fix-fullscreen-issue.patch | 27 +++
.../patches/irrlicht-use-system-libs.patch | 202 +++++++++++++++++++++
gnu/packages/patches/lxc-CVE-2018-6556.patch | 116 ++++++++++++
.../patches/mariadb-client-test-32bit.patch | 37 ++++
gnu/packages/patches/meson-for-build-rpath.patch | 3 +-
gnu/packages/patches/openblas-fix-tests-i686.patch | 35 ----
gnu/packages/patches/polkit-drop-test.patch | 18 --
gnu/packages/patches/pulseaudio-glibc-2.27.patch | 67 -------
.../patches/wpa-supplicant-CVE-2018-14526.patch | 53 ++++++
gnu/packages/patches/xorg-server-rotate-fb.patch | 35 ----
gnu/packages/patchutils.scm | 27 ++-
gnu/packages/pciutils.scm | 4 +-
gnu/packages/pdf.scm | 14 +-
gnu/packages/plotutils.scm | 4 +-
gnu/packages/polkit.scm | 14 +-
gnu/packages/profiling.scm | 4 +-
gnu/packages/pulseaudio.scm | 34 ++--
gnu/packages/python.scm | 2 +-
gnu/packages/rdf.scm | 4 +-
gnu/packages/ruby.scm | 23 ++-
gnu/packages/rust.scm | 17 +-
gnu/packages/syncthing.scm | 23 ---
gnu/packages/version-control.scm | 28 +--
gnu/packages/video.scm | 36 +++-
gnu/packages/virtualization.scm | 5 +-
gnu/packages/vulkan.scm | 8 +-
gnu/packages/web-browsers.scm | 4 +-
gnu/packages/web.scm | 12 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 13 +-
gnu/packages/xdisorg.scm | 4 +-
gnu/packages/xorg.scm | 15 +-
gnu/services/base.scm | 2 +-
guix/build-system/meson.scm | 20 +-
guix/build/ant-build-system.scm | 6 +-
guix/build/meson-build-system.scm | 23 +--
guix/import/cabal.scm | 7 +-
guix/import/hackage.scm | 6 +-
76 files changed, 1384 insertions(+), 672 deletions(-)
diff --cc gnu/packages/patches/meson-for-build-rpath.patch
index 04c07d0,59249e2..ef9a73f
--- a/gnu/packages/patches/meson-for-build-rpath.patch
+++ b/gnu/packages/patches/meson-for-build-rpath.patch
@@@ -2,11 -2,10 +2,10 @@@ This patch removes a part of meson tha
This will only be applied to a special version of meson, used for the
meson-build-system.
- Patch for Meson 0.42.0 by Peter Mikkelsen <address@hidden>
- Adjusted for Meson 0.47.1 by Ricardo Wurmus <address@hidden>
-Patch by Peter Mikkelsen <address@hidden>
++Original patch for Meson 0.42.0 by Peter Mikkelsen <address@hidden>
---- meson-0.42.0/mesonbuild/minstall.py.orig 2017-09-09 01:49:39.147374148
+0200
-+++ meson-0.42.0/mesonbuild/minstall.py 2017-09-09 01:51:01.209134717
+0200
+--- meson-0.47.1/mesonbuild/minstall.py.old 2018-08-10 11:01:27.812327013
+0200
++++ meson-0.47.1/mesonbuild/minstall.py 2018-08-10 11:01:51.940368505
+0200
@@ -436,15 +436,6 @@
print("Symlink creation does not work on this
platform. "
"Skipping all symlinking.")
diff --cc guix/build/meson-build-system.scm
index 9724764,80e5472..f6b8b49
--- a/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@@ -1,6 -1,6 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Peter Mikkelsen <address@hidden>
+;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2018 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;