mbakke pushed a commit to branch staging
in repository guix.
commit 4eade64706d88434fb6096e2b9506e2022e3137b
Merge: 7ace973 be95bcf
Author: Marius Bakke <[email protected]>
Date: Mon Mar 19 03:50:39 2018 +0100
Merge branch 'master' into staging
gnu/build/linux-modules.scm | 19 ++--
gnu/packages/cran.scm | 31 ++++++
gnu/packages/gnome.scm | 4 +-
gnu/packages/gnuzilla.scm | 5 +-
gnu/packages/maths.scm | 34 ++++++
gnu/packages/ruby.scm | 260 ++++++++++++++++++++++++++++++++++++++++++++
gnu/packages/video.scm | 4 +-
gnu/system/vm.scm | 1 +
guix/git-download.scm | 2 +-
guix/glob.scm | 124 ++++++++++++++-------
guix/import/elpa.scm | 15 ++-
tests/elpa.scm | 43 +++++---
tests/glob.scm | 67 +++++++-----
13 files changed, 503 insertions(+), 106 deletions(-)
