[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: |
Mon, 8 Jun 2020 13:10:33 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit dd2d3ed2d30b5d705f9ed8695ab3171c29469f76
Merge: 24b61fb 1fd2c00
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Jun 8 19:05:56 2020 +0200
Merge branch 'master' into staging
.dir-locals.el | 2 +
Makefile.am | 3 +-
doc/guix.texi | 90 ++++++++++++++-
gnu/bootloader.scm | 46 +++++++-
gnu/bootloader/grub.scm | 76 ++++++++-----
gnu/build/activation.scm | 4 +-
gnu/build/hurd-boot.scm | 205 ++++++++++++++++++++++++++++++++++
gnu/build/image.scm | 5 +
gnu/build/linux-boot.scm | 33 +-----
gnu/build/vm.scm | 11 +-
gnu/local.mk | 3 +
gnu/packages/admin.scm | 24 +++-
gnu/packages/backup.scm | 4 +-
gnu/packages/docker.scm | 6 +-
gnu/packages/education.scm | 5 +-
gnu/packages/emacs-xyz.scm | 81 +++++++++-----
gnu/packages/enlightenment.scm | 40 +++++++
gnu/packages/fonts.scm | 6 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/gnome-xyz.scm | 34 ++++++
gnu/packages/gnome.scm | 13 +++
gnu/packages/golang.scm | 115 +++++++++++--------
gnu/packages/hurd.scm | 143 +++++++++---------------
gnu/packages/linux.scm | 77 +++++++++----
gnu/packages/lisp-xyz.scm | 59 ++++++++++
gnu/packages/machine-learning.scm | 15 +--
gnu/packages/mail.scm | 4 +-
gnu/packages/make-bootstrap.scm | 7 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/patches/hurd-xattr.patch | 53 +++++++++
gnu/packages/python-web.scm | 37 +++---
gnu/packages/python-xyz.scm | 72 ++++++------
gnu/packages/qt.scm | 6 +-
gnu/packages/skarnet.scm | 4 +-
gnu/packages/ssh.scm | 14 ++-
gnu/packages/version-control.scm | 4 +-
gnu/packages/video.scm | 9 +-
gnu/packages/vim.scm | 28 +++++
gnu/packages/vpn.scm | 4 +-
gnu/services.scm | 37 ++++++
gnu/services/hurd.scm | 123 ++++++++++++++++++++
gnu/system.scm | 161 +++++++++++++++++++-------
gnu/system/examples/bare-bones.tmpl | 3 +-
gnu/system/examples/bare-hurd.tmpl | 31 +++++
gnu/system/hurd.scm | 63 ++++++++++-
gnu/system/image.scm | 42 ++++++-
gnu/system/install.scm | 11 +-
gnu/system/vm.scm | 68 +++++++----
guix/build/syscalls.scm | 14 ++-
guix/git-authenticate.scm | 28 ++++-
guix/git.scm | 29 +++--
guix/grafts.scm | 85 ++++++++------
guix/packages.scm | 30 ++---
guix/tests/git.scm | 4 +-
guix/tests/gnupg.scm | 22 +---
guix/ui.scm | 57 ++++++----
guix/utils.scm | 50 +++++++--
nix/libstore/gc.cc | 5 +-
tests/git-authenticate.scm | 41 +++++++
tests/guix-system.sh | 7 +-
tests/packages.scm | 33 ++++++
61 files changed, 1737 insertions(+), 559 deletions(-)
diff --cc gnu/packages/linux.scm
index 0435790,329bf7c..78ca56f
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -43,7 -43,7 +43,8 @@@
;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
+ ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;;
;;; This file is part of GNU Guix.
;;;