[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Mon, 13 Apr 2015 05:29:49 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 1ca8ff285ba0f055fbaf314d8a23fadc25839135
Merge: 14fe948 4c9050c
Author: Mark H Weaver <address@hidden>
Date: Mon Apr 13 01:25:28 2015 -0400
Merge branch 'master' into core-updates
Makefile.am | 4 +
configure.ac | 7 ++
doc/guix.texi | 38 +++++++++-
etc/completion/bash/guix | 139 +++++++++++++++++++++++++++++++++
gnu/build/activation.scm | 13 +++
gnu/packages/bioinformatics.scm | 160 +++++++++++++++++++++++++++++++++++++++
gnu/packages/emacs.scm | 6 +-
gnu/packages/gstreamer.scm | 39 +++++++++-
gnu/packages/man.scm | 6 +-
gnu/services/base.scm | 2 +-
gnu/system.scm | 18 +++++
11 files changed, 421 insertions(+), 11 deletions(-)