[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into staging
From: |
Marius Bakke |
Subject: |
02/02: Merge branch 'master' into staging |
Date: |
Mon, 30 Jul 2018 12:14:19 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 869250809bddcf8eab26ecdedabad6fc060751dd
Merge: f419abe f475b90
Author: Marius Bakke <address@hidden>
Date: Mon Jul 30 18:08:28 2018 +0200
Merge branch 'master' into staging
doc/guix.texi | 9 ++
gnu/build/linux-modules.scm | 36 +++++++
gnu/local.mk | 2 +-
gnu/packages/agda.scm | 30 ++++++
gnu/packages/android.scm | 106 ++++++++++++++++++++-
gnu/packages/bioinformatics.scm | 59 ++++++++----
gnu/packages/bootloaders.scm | 5 +-
gnu/packages/check.scm | 26 ++++-
gnu/packages/ci.scm | 4 +-
gnu/packages/cran.scm | 35 +------
gnu/packages/databases.scm | 9 +-
gnu/packages/docker.scm | 43 ++++++++-
gnu/packages/emacs.scm | 46 ---------
gnu/packages/finance.scm | 41 ++++++--
gnu/packages/games.scm | 60 +++++++++---
gnu/packages/haskell.scm | 45 ---------
gnu/packages/java.scm | 5 +
gnu/packages/libreoffice.scm | 7 +-
gnu/packages/linux.scm | 16 ++--
gnu/packages/maths.scm | 2 +-
gnu/packages/messaging.scm | 29 +++---
gnu/packages/parallel.scm | 6 +-
gnu/packages/patches/libreoffice-glm.patch | 58 +++++++++++
.../patches/python-dendropy-fix-tests.patch | 41 --------
gnu/packages/perl.scm | 24 -----
gnu/packages/python.scm | 24 -----
gnu/packages/ssh.scm | 4 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 5 +-
gnu/packages/virtualization.scm | 53 +++++++----
gnu/packages/xdisorg.scm | 26 ++++-
gnu/services/ssh.scm | 22 +++++
gnu/system/linux-initrd.scm | 26 +----
gnu/system/mapped-devices.scm | 29 +++---
guix/ssh.scm | 11 ++-
35 files changed, 596 insertions(+), 354 deletions(-)