[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: |
Tue, 20 Mar 2018 09:15:26 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit dc7e07c9b9780883a462c5973cd2ecad06fdb4ae
Merge: 616446f dbc75da
Author: Marius Bakke <address@hidden>
Date: Tue Mar 20 14:13:05 2018 +0100
Merge branch 'staging'
gnu/local.mk | 4 +-
gnu/packages/base.scm | 55 ++++++-
gnu/packages/build-tools.scm | 22 +--
gnu/packages/calendar.scm | 26 ++-
gnu/packages/certs.scm | 15 +-
gnu/packages/elf.scm | 19 ++-
gnu/packages/freedesktop.scm | 50 +++---
gnu/packages/gl.scm | 14 +-
gnu/packages/gnome.scm | 58 ++++---
gnu/packages/gnuzilla.scm | 14 +-
gnu/packages/gtk.scm | 11 +-
gnu/packages/image.scm | 4 +-
gnu/packages/linux.scm | 16 +-
gnu/packages/ninja.scm | 2 +
.../patches/giflib-make-reallocarray-private.patch | 120 ++++++++++++++
.../patches/gnome-todo-libical-compat.patch | 17 ++
gnu/packages/patches/gtk2-fix-failing-test.patch | 39 -----
.../patches/json-glib-fix-tests-32bit.patch | 174 +++++++++++++++++++++
gnu/packages/pciutils.scm | 5 +-
gnu/packages/pulseaudio.scm | 13 +-
gnu/packages/python.scm | 14 +-
gnu/packages/video.scm | 4 +-
gnu/packages/web.scm | 7 +-
gnu/packages/xdisorg.scm | 12 +-
gnu/packages/xiph.scm | 4 +-
gnu/packages/xorg.scm | 12 +-
guix/build-system/meson.scm | 18 ++-
guix/build/meson-build-system.scm | 9 ++
28 files changed, 563 insertions(+), 195 deletions(-)