[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging'
From: |
guix-commits |
Subject: |
01/01: Merge branch 'staging' |
Date: |
Tue, 13 Aug 2019 12:52:22 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 1b1b006afd31c5526f34d157baef492c7dde2e9c
Merge: fc34abf 5e5cdac
Author: Marius Bakke <address@hidden>
Date: Tue Aug 13 18:51:12 2019 +0200
Merge branch 'staging'
gnu/local.mk | 2 +-
gnu/packages/certs.scm | 4 ++--
gnu/packages/cups.scm | 4 ++--
gnu/packages/databases.scm | 22 ++++++++++----------
gnu/packages/gl.scm | 15 ++++++--------
gnu/packages/gtk.scm | 6 ++----
gnu/packages/image.scm | 4 ++--
gnu/packages/imagemagick.scm | 4 ++--
gnu/packages/maths.scm | 4 ++--
gnu/packages/nss.scm | 5 +++--
gnu/packages/patches/flac-CVE-2017-6888.patch | 29 ---------------------------
gnu/packages/patches/nss-freebl-stubs.patch | 20 ++++++++++++++++++
gnu/packages/pcre.scm | 14 +------------
gnu/packages/perl.scm | 6 +++---
gnu/packages/php.scm | 2 +-
gnu/packages/python-xyz.scm | 21 +++++++++++++------
gnu/packages/version-control.scm | 4 ++--
gnu/packages/video.scm | 4 ++--
gnu/packages/vulkan.scm | 8 ++++----
gnu/packages/web.scm | 8 ++++----
gnu/packages/wine.scm | 28 ++++++++++++++++++++------
gnu/packages/xiph.scm | 5 ++---
gnu/packages/xorg.scm | 4 ++--
guix/build/ant-build-system.scm | 10 ++++-----
24 files changed, 116 insertions(+), 117 deletions(-)