[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: |
Thu, 8 Mar 2018 15:23:32 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit d8fa1890c705ca566a56b69a4880a10dc7cf0098
Merge: 5de561a fee7f8a
Author: Marius Bakke <address@hidden>
Date: Thu Mar 8 21:21:05 2018 +0100
Merge branch 'master' into staging
gnu/local.mk | 1 +
gnu/packages/admin.scm | 57 +++--
gnu/packages/base.scm | 1 -
gnu/packages/bioinformatics.scm | 73 +++++-
gnu/packages/build-tools.scm | 6 +-
gnu/packages/check.scm | 10 +-
gnu/packages/code.scm | 8 +-
gnu/packages/commencement.scm | 45 ++--
gnu/packages/compression.scm | 8 +-
gnu/packages/cran.scm | 186 ++++++++++++++
gnu/packages/crypto.scm | 4 +-
gnu/packages/debug.scm | 12 +-
gnu/packages/emacs.scm | 6 +-
gnu/packages/flashing-tools.scm | 14 +-
gnu/packages/fonts.scm | 22 ++
gnu/packages/glib.scm | 15 +-
gnu/packages/gnome.scm | 2 +-
gnu/packages/gtk.scm | 48 +++-
gnu/packages/guile.scm | 17 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/maven.scm | 130 ++++++++++
gnu/packages/messaging.scm | 4 +-
gnu/packages/music.scm | 4 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 8 +-
.../patches/glibc-allow-kernel-2.6.32.patch | 7 +
gnu/packages/patches/thefuck-test-environ.patch | 20 +-
gnu/packages/python-web.scm | 37 +++
gnu/packages/python.scm | 10 +-
gnu/packages/statistics.scm | 32 +++
gnu/packages/text-editors.scm | 6 +-
gnu/packages/video.scm | 22 +-
gnu/packages/vulkan.scm | 4 +-
gnu/packages/web-browsers.scm | 14 +-
gnu/packages/web.scm | 2 +-
gnu/packages/xorg.scm | 14 +-
gnu/services/base.scm | 285 ++++++++++-----------
gnu/services/dict.scm | 3 +-
gnu/system.scm | 3 +-
gnu/system/install.scm | 2 +-
gnu/system/linux-initrd.scm | 36 ++-
gnu/system/mapped-devices.scm | 19 +-
gnu/system/vm.scm | 14 +-
guix/hash.scm | 23 +-
guix/scripts/system.scm | 23 +-
guix/ui.scm | 8 +-
po/guix/POTFILES.in | 1 +
tests/hash.scm | 8 +
50 files changed, 941 insertions(+), 349 deletions(-)