[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
From: |
Mark H. Weaver |
Subject: |
01/01: Merge branch 'master' into staging |
Date: |
Sun, 11 Dec 2016 04:06:20 +0000 (UTC) |
mhw pushed a commit to branch staging
in repository guix.
commit d94691e0c21440657ad198b03145743d4a876829
Merge: 72c0b68 edd1652
Author: Mark H Weaver <address@hidden>
Date: Sat Dec 10 23:03:57 2016 -0500
Merge branch 'master' into staging
doc/guix.texi | 6 +
gnu/local.mk | 2 +-
gnu/packages/bioinformatics.scm | 11 +-
gnu/packages/gnustep.scm | 8 +-
gnu/packages/gnuzilla.scm | 10 +-
gnu/packages/haskell.scm | 213 +++++++++++++----
gnu/packages/image.scm | 17 +-
gnu/packages/libevent.scm | 4 +-
gnu/packages/linux.scm | 72 +++++-
gnu/packages/maths.scm | 4 +-
gnu/packages/music.scm | 68 ++++++
gnu/packages/ocaml.scm | 70 ++++--
gnu/packages/password-utils.scm | 4 +
gnu/packages/patches/openjpeg-CVE-2015-6581.patch | 47 ----
.../openjpeg-CVE-2016-9850-CVE-2016-9851.patch | 245 ++++++++++++++++++++
gnu/packages/tls.scm | 45 +++-
gnu/packages/video.scm | 4 +-
gnu/packages/web.scm | 4 +-
guix/scripts/offload.scm | 38 ++-
19 files changed, 726 insertions(+), 146 deletions(-)