[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, 27 Dec 2018 09:47:00 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit af8fd11bed63af2ba97749fe7375880e0c5f0b20
Merge: 1262be5 5a7899f
Author: Marius Bakke <address@hidden>
Date: Thu Dec 27 15:44:38 2018 +0100
Merge branch 'master' into staging
doc/guix.texi | 10 +++
gnu/packages/emacs.scm | 58 +++++++++++++
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/guile.scm | 29 +++++++
gnu/packages/image-viewers.scm | 10 ++-
gnu/packages/java.scm | 5 ++
gnu/packages/kodi.scm | 4 +-
gnu/packages/linux.scm | 6 +-
gnu/packages/ocaml.scm | 155 +++++++++++++++++++++++----------
gnu/packages/package-management.scm | 6 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/scheme.scm | 24 ++++-
gnu/packages/tls.scm | 4 +-
gnu/packages/vim.scm | 13 +--
gnu/packages/vpn.scm | 47 ++++++++++
gnu/system.scm | 2 +-
guix/scripts/lint.scm | 23 ++++-
guix/scripts/offload.scm | 169 ++++++++++++++++--------------------
guix/scripts/pull.scm | 7 +-
tests/lint.scm | 80 +++++++++++++++++
20 files changed, 489 insertions(+), 171 deletions(-)