[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
From: |
Mark H. Weaver |
Subject: |
01/01: Merge branch 'master' into core-updates |
Date: |
Mon, 7 Aug 2017 16:48:00 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 2d9495da23cb110dd70eac67637f8e362133d021
Merge: c97fbf5 a1aa5da
Author: Mark H Weaver <address@hidden>
Date: Mon Aug 7 16:45:16 2017 -0400
Merge branch 'master' into core-updates
doc/contributing.texi | 7 +-
gnu/local.mk | 2 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/bootloaders.scm | 92 +++++++++++++-----------
gnu/packages/calendar.scm | 6 +-
gnu/packages/embedded.scm | 3 +-
gnu/packages/enlightenment.scm | 19 +++--
gnu/packages/fonts.scm | 32 ++++++++-
gnu/packages/game-development.scm | 32 ++-------
gnu/packages/games.scm | 5 +-
gnu/packages/gnucash.scm | 4 +-
gnu/packages/linux.scm | 7 +-
gnu/packages/maths.scm | 2 +-
gnu/packages/motti.scm | 45 ++++++++++++
gnu/packages/mp3.scm | 4 +-
gnu/packages/nim.scm | 19 +++--
gnu/packages/password-utils.scm | 38 +++++++++-
gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch | 43 -----------
gnu/packages/python.scm | 27 ++++++-
gnu/packages/video.scm | 7 +-
nix/libstore/build.cc | 11 +--
22 files changed, 247 insertions(+), 164 deletions(-)