[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into security-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into security-updates |
|
Date: |
Sun, 14 Feb 2016 13:37:49 +0000 |
mhw pushed a commit to branch security-updates
in repository guix.
commit c7783d201341e6e0df58f6e0e4d2db89ca63c765
Merge: c1ee70c 38b2091
Author: Mark H Weaver <address@hidden>
Date: Sun Feb 14 08:36:30 2016 -0500
Merge branch 'master' into security-updates
doc/guix.texi | 494 ++++++++++----------
gnu-system.am | 3 +
gnu/packages/bioinformatics.scm | 8 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/gnome.scm | 33 ++
gnu/packages/gnunet.scm | 37 ++
gnu/packages/gnupg.scm | 7 +-
gnu/packages/linux.scm | 66 ++-
gnu/packages/maths.scm | 4 +-
gnu/packages/music.scm | 38 ++
gnu/packages/ocaml.scm | 57 +++
gnu/packages/openbox.scm | 7 +-
gnu/packages/openstack.scm | 18 +-
...gnupg-simple-query-ignore-status-messages.patch | 142 ++++++
.../patches/ocaml-findlib-make-install.patch | 20 +
gnu/packages/patches/tclxml-3.2-install.patch | 17 +
gnu/packages/python.scm | 100 +++--
gnu/packages/tcl.scm | 75 +++-
gnu/packages/tls.scm | 34 +-
gnu/packages/web.scm | 5 +-
gnu/system/install.scm | 1 +
guix/licenses.scm | 6 +
guix/profiles.scm | 10 +-
guix/scripts/environment.scm | 239 ++++++-----
guix/store.scm | 16 +-
tests/guix-environment-container.sh | 2 +-
tests/guix-environment.sh | 104 +++--
tests/store.scm | 11 +-
29 files changed, 1061 insertions(+), 501 deletions(-)