[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Fri, 26 May 2017 21:56:05 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 9df24909e252980c2393d2baaa617c30db8c9dd8
Merge: ae40e02 fdabfdb
Author: Marius Bakke <address@hidden>
Date: Sat May 27 03:55:24 2017 +0200
Merge branch 'master' into staging
gnu/local.mk | 3 +-
gnu/packages/admin.scm | 39 ++-
gnu/packages/audio.scm | 7 +-
gnu/packages/avr.scm | 4 +-
gnu/packages/connman.scm | 5 +-
gnu/packages/cross-base.scm | 32 +-
gnu/packages/crypto.scm | 26 +-
gnu/packages/emacs.scm | 53 ++-
gnu/packages/embedded.scm | 43 ++-
gnu/packages/game-development.scm | 15 +-
gnu/packages/games.scm | 9 +-
gnu/packages/graphics.scm | 106 +++---
gnu/packages/kodi.scm | 6 +-
gnu/packages/linux.scm | 95 +++++-
gnu/packages/logging.scm | 40 +++
gnu/packages/make-bootstrap.scm | 4 +-
gnu/packages/messaging.scm | 53 ++-
gnu/packages/music.scm | 10 +-
gnu/packages/ocaml.scm | 257 +++++++++++++++
gnu/packages/patches/libtasn1-CVE-2017-6891.patch | 51 +++
gnu/packages/python.scm | 223 +++++++++++--
gnu/packages/scanner.scm | 51 +--
gnu/packages/tls.scm | 18 +-
gnu/packages/video.scm | 4 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 11 +-
gnu/packages/xdisorg.scm | 4 +-
guix/base64.scm | 377 +++++++++++-----------
guix/build-system/gnu.scm | 4 +-
guix/build/pull.scm | 25 +-
guix/modules.scm | 21 +-
tests/modules.scm | 25 +-
32 files changed, 1216 insertions(+), 409 deletions(-)