[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: |
Sat, 6 Jul 2019 19:19:43 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 36175a3a9eb5bd4096de4e06e1f6b0e8cd895d84
Merge: 42dcfca c72647f
Author: Marius Bakke <address@hidden>
Date: Sun Jul 7 01:18:18 2019 +0200
Merge branch 'master' into staging
Makefile.am | 3 +
doc/guix.texi | 114 +++++++++
gnu/build/linux-container.scm | 7 +-
gnu/ci.scm | 6 +-
gnu/local.mk | 6 +-
gnu/machine.scm | 107 +++++++++
gnu/machine/ssh.scm | 369 +++++++++++++++++++++++++++++
gnu/packages/bioinformatics.scm | 6 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/gnome.scm | 2 +-
gnu/packages/guile-xyz.scm | 2 +-
gnu/packages/image.scm | 30 ++-
gnu/packages/lisp.scm | 501 +++++++++++++++++++++++++++++++++++++++-
gnu/packages/logo.scm | 71 ++++++
gnu/packages/patchutils.scm | 4 +-
gnu/packages/photo.scm | 8 +-
gnu/packages/pulseaudio.scm | 58 +++++
gnu/packages/python-xyz.scm | 118 +++++++++-
gnu/packages/serialization.scm | 14 +-
gnu/packages/wine.scm | 6 +-
gnu/tests/docker.scm | 18 +-
gnu/tests/install.scm | 2 +-
gnu/tests/singularity.scm | 18 +-
guix/channels.scm | 43 ++--
guix/derivations.scm | 115 ++++-----
guix/docker.scm | 17 +-
guix/gexp.scm | 240 ++++++++++++++-----
guix/inferior.scm | 9 +-
guix/remote.scm | 134 +++++++++++
guix/repl.scm | 86 +++++++
guix/scripts/deploy.scm | 84 +++++++
guix/scripts/pack.scm | 64 ++++-
guix/scripts/repl.scm | 56 +----
guix/ssh.scm | 10 +-
guix/store.scm | 11 +-
guix/ui.scm | 15 +-
po/guix/POTFILES.in | 2 +
tests/derivations.scm | 29 +++
tests/gexp.scm | 37 +++
39 files changed, 2148 insertions(+), 278 deletions(-)