[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into gnome-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into gnome-updates |
|
Date: |
Wed, 04 May 2016 15:44:07 +0000 |
mhw pushed a commit to branch gnome-updates
in repository guix.
commit 4e9d04a80b2d8b1e07f78708dae76b13f3d421f6
Merge: ad1b7d8 11057c4
Author: Mark H Weaver <address@hidden>
Date: Wed May 4 11:43:50 2016 -0400
Merge branch 'master' into gnome-updates
gnu/local.mk | 9 +
gnu/packages/admin.scm | 7 +-
gnu/packages/bioinformatics.scm | 8 +-
gnu/packages/commencement.scm | 3 +
gnu/packages/cross-base.scm | 67 ++--
gnu/packages/databases.scm | 53 ++++
gnu/packages/games.scm | 4 +-
gnu/packages/gcc.scm | 15 +-
gnu/packages/gnupg.scm | 42 ++-
gnu/packages/java.scm | 190 ++++++++++++
gnu/packages/linux.scm | 26 +-
gnu/packages/maths.scm | 39 +++
gnu/packages/messaging.scm | 25 +-
gnu/packages/music.scm | 73 +++++
gnu/packages/ocaml.scm | 3 +-
gnu/packages/patches/4store-fix-buildsystem.patch | 56 ++++
.../patches/gcc-cross-environment-variables.patch | 51 ++-
gnu/packages/patches/ocaml-CVE-2015-8869.patch | 72 +++++
gnu/packages/patches/portmidi-modular-build.patch | 325 ++++++++++++++++++++
.../patches/wpa-supplicant-CVE-2016-4476.patch | 82 +++++
.../patches/wpa-supplicant-CVE-2016-4477-pt1.patch | 51 +++
.../patches/wpa-supplicant-CVE-2016-4477-pt2.patch | 82 +++++
.../patches/wpa-supplicant-CVE-2016-4477-pt3.patch | 62 ++++
.../patches/wpa-supplicant-CVE-2016-4477-pt4.patch | 50 +++
gnu/packages/tls.scm | 20 ++
gnu/packages/version-control.scm | 56 +++-
guix/build/syscalls.scm | 16 +-
tests/syscalls.scm | 2 +-
28 files changed, 1416 insertions(+), 73 deletions(-)