[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Tue, 11 Jun 2019 04:29:27 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 58bf51b4c0771fb6cfcf22be84d734096e7b11e0
Merge: 69ecd66 bf30053
Author: Marius Bakke <address@hidden>
Date: Tue Jun 11 10:27:09 2019 +0200
Merge branch 'master' into staging
doc/guix.texi | 58 +-
gnu/artwork.scm | 4 +-
gnu/local.mk | 4 +-
gnu/packages/astronomy.scm | 8 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/bioconductor.scm | 79 +-
gnu/packages/bioinformatics.scm | 8 +-
gnu/packages/cran.scm | 51 +-
gnu/packages/databases.scm | 25 +-
gnu/packages/emacs-xyz.scm | 45 +-
gnu/packages/gl.scm | 4 +-
gnu/packages/gnome.scm | 10 +-
gnu/packages/image.scm | 8 +-
gnu/packages/linux.scm | 46 +-
gnu/packages/mail.scm | 4 +-
.../patches/allegro-mesa-18.2.5-and-later.patch | 41 +
gnu/packages/statistics.scm | 36 +-
gnu/packages/tbb.scm | 4 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/wine.scm | 6 +-
gnu/services/base.scm | 10 +-
gnu/services/nix.scm | 112 +
gnu/services/xorg.scm | 2 +-
guix/derivations.scm | 13 +-
guix/download.scm | 4 +-
guix/gnu-maintenance.scm | 6 +-
guix/scripts/pack.scm | 5 +-
guix/ssh.scm | 1 +
guix/store.scm | 26 +-
po/doc/guix-manual.de.po | 17215 +++++++++----------
tests/derivations.scm | 22 +
tests/store.scm | 20 +
32 files changed, 9092 insertions(+), 8793 deletions(-)