[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: |
Thu, 28 Nov 2019 10:50:40 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 34f849a945d25daa76d93839dcf8768c8b45b636
Merge: 0897ad7 c09f598
Author: Marius Bakke <address@hidden>
Date: Thu Nov 28 16:47:01 2019 +0100
Merge branch 'master' into staging
doc/build.scm | 1 +
doc/guix.texi | 86 ++++++++++++++++++++++++++++++++++
gnu/local.mk | 1 +
gnu/packages/cran.scm | 41 ++++++++--------
gnu/packages/disk.scm | 6 +--
gnu/packages/games.scm | 24 ++++++++--
gnu/packages/gnome.scm | 1 +
gnu/packages/graph.scm | 4 +-
gnu/packages/graphics.scm | 10 ++--
gnu/packages/kde.scm | 3 +-
gnu/packages/lisp.scm | 31 ++++++++-----
gnu/packages/python-xyz.scm | 4 +-
gnu/packages/statistics.scm | 12 ++---
gnu/packages/video.scm | 18 +++----
gnu/services/pam-mount.scm | 111 ++++++++++++++++++++++++++++++++++++++++++++
gnu/services/web.scm | 4 +-
guix/lint.scm | 1 +
guix/scripts/substitute.scm | 26 +++++++----
guix/ui.scm | 42 ++++++++++-------
19 files changed, 337 insertions(+), 89 deletions(-)