[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: Merge branch 'master' into staging
|
From: |
Leo Famulari |
|
Subject: |
02/04: Merge branch 'master' into staging |
|
Date: |
Sat, 7 Jan 2017 21:46:13 +0000 (UTC) |
lfam pushed a commit to branch staging
in repository guix.
commit a0a529a1a6b0e0bf0178922b88e68b1a597395cd
Merge: 7932b91 724c111
Author: Leo Famulari <address@hidden>
Date: Sat Jan 7 16:43:07 2017 -0500
Merge branch 'master' into staging
HACKING | 5 +
Makefile.am | 1 +
doc/guix.texi | 18 +-
etc/git/pre-push | 57 ++++
gnu/build/file-systems.scm | 126 ++++---
gnu/local.mk | 9 +-
gnu/packages/bioinformatics.scm | 103 +++++-
gnu/packages/bittorrent.scm | 9 +-
gnu/packages/calendar.scm | 1 +
gnu/packages/dav.scm | 4 +-
gnu/packages/emacs.scm | 16 +-
gnu/packages/engineering.scm | 13 +-
gnu/packages/fonts.scm | 104 +++---
gnu/packages/gnome.scm | 18 +-
gnu/packages/gnupg.scm | 3 +-
gnu/packages/gv.scm | 23 +-
gnu/packages/haskell.scm | 27 ++
gnu/packages/inkscape.scm | 32 +-
gnu/packages/irc.scm | 16 +-
gnu/packages/libreoffice.scm | 5 +-
gnu/packages/mtools.scm | 3 +-
gnu/packages/ocaml.scm | 358 +++++++++++++++++++-
.../patches/inkscape-drop-wait-for-targets.patch | 68 ----
.../patches/khal-disable-failing-tests.patch | 33 ++
...ml-bisect-fix-camlp4-in-another-directory.patch | 125 +++++++
.../patches/ocaml-bitstring-fix-configure.patch | 53 +++
.../patches/python-pycrypto-CVE-2013-7459.patch | 97 ++++++
.../python-pygpgme-fix-pinentry-tests.patch | 69 ++++
gnu/packages/patches/unrtf-CVE-2016-10091.patch | 189 +++++++++++
gnu/packages/python.scm | 86 ++++-
gnu/packages/ruby.scm | 8 +-
gnu/packages/sdl.scm | 15 +-
gnu/packages/terminals.scm | 38 ++-
gnu/packages/unrtf.scm | 2 +
gnu/packages/vim.scm | 4 +-
guix/derivations.scm | 47 +--
guix/docker.scm | 127 +++++++
guix/scripts/archive.scm | 17 +-
38 files changed, 1616 insertions(+), 313 deletions(-)