guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'staging'


From: Marius Bakke
Subject: 01/01: Merge branch 'staging'
Date: Thu, 12 Jul 2018 18:28:10 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 49b6dc2b4e02269850dacc71d9e7ec93139ec5b5
Merge: 7519dc9 2776b5d
Author: Marius Bakke <address@hidden>
Date:   Fri Jul 13 00:25:45 2018 +0200

    Merge branch 'staging'

 gnu/local.mk                                       |    7 +-
 gnu/packages/base.scm                              |   28 +-
 gnu/packages/build-tools.scm                       |    4 +-
 gnu/packages/certs.scm                             |    4 +-
 gnu/packages/databases.scm                         |    4 +-
 gnu/packages/documentation.scm                     |    4 +-
 gnu/packages/freedesktop.scm                       |    8 +-
 gnu/packages/gcc.scm                               |    2 +-
 gnu/packages/gl.scm                                |   29 +-
 gnu/packages/gnome.scm                             |   11 +-
 gnu/packages/gnuzilla.scm                          |    4 +-
 gnu/packages/gtk.scm                               |   21 +-
 gnu/packages/java.scm                              |  456 ++++---
 gnu/packages/linux.scm                             |   29 +-
 gnu/packages/maths.scm                             |   19 +-
 .../alsa-lib-add-environment-variable.patch        |  110 --
 gnu/packages/patches/jamvm-arm.patch               | 1313 ++++++++++++++++++++
 .../mesa-wayland-egl-symbols-check-mips.patch      |   15 -
 gnu/packages/patches/meson-for-build-rpath.patch   |    7 +-
 gnu/packages/patches/openblas-fix-tests-i686.patch |   35 +
 .../patches/xf86-video-savage-xorg-compat.patch    |   33 +
 .../patches/xf86-video-sis-xorg-compat.patch       |   18 +
 .../zathura-pdf-mupdf-link-to-jpeg-libraries.patch |   55 +
 .../zathura-plugindir-environment-variable.patch   |   11 +-
 gnu/packages/pdf.scm                               |  145 ++-
 gnu/packages/python.scm                            |    4 +-
 gnu/packages/xdisorg.scm                           |    5 +-
 gnu/packages/xorg.scm                              |   82 +-
 guix/build-system/meson.scm                        |    3 +-
 guix/build/ant-build-system.scm                    |   98 +-
 guix/build/java-utils.scm                          |    2 +-
 guix/build/meson-build-system.scm                  |   15 +-
 32 files changed, 2031 insertions(+), 550 deletions(-)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]