[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: |
Wed, 11 Mar 2020 18:03:08 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 41c6e4f2b40f41cdbf4e8c7ade29845709f9cdf4
Merge: 4510aeb 58363ee
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Mar 11 22:58:11 2020 +0100
Merge branch 'master' into staging
.gitignore | 1 +
configure.ac | 6 +-
etc/guix-install.sh | 11 ++
etc/init.d/guix-daemon.in | 78 +++++++++++++
gnu/packages/admin.scm | 19 +--
gnu/packages/algebra.scm | 9 +-
gnu/packages/assembly.scm | 29 +++++
gnu/packages/audio.scm | 2 +-
gnu/packages/bash.scm | 2 +-
gnu/packages/bioinformatics.scm | 30 +++--
gnu/packages/cran.scm | 35 +++++-
gnu/packages/crypto.scm | 4 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/databases.scm | 2 +-
gnu/packages/docker.scm | 6 +-
gnu/packages/emulators.scm | 2 +-
gnu/packages/flashing-tools.scm | 2 +-
gnu/packages/fontutils.scm | 2 +-
gnu/packages/freedesktop.scm | 9 +-
gnu/packages/games.scm | 12 +-
gnu/packages/gd.scm | 2 +-
gnu/packages/geo.scm | 8 ++
gnu/packages/gimp.scm | 8 +-
gnu/packages/gnome.scm | 31 ++++-
gnu/packages/gps.scm | 10 +-
gnu/packages/graphviz.scm | 5 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/installers.scm | 4 +-
gnu/packages/ipfs.scm | 6 +-
gnu/packages/java.scm | 6 +-
gnu/packages/linux.scm | 2 +-
gnu/packages/mpi.scm | 8 +-
gnu/packages/music.scm | 36 ------
gnu/packages/networking.scm | 4 +-
gnu/packages/plotutils.scm | 16 +--
gnu/packages/python-web.scm | 2 +-
gnu/packages/python-xyz.scm | 241 ++++++++++++++++++++++++---------------
gnu/packages/ruby.scm | 2 +-
gnu/packages/skarnet.scm | 30 ++---
gnu/packages/tls.scm | 17 ++-
gnu/packages/version-control.scm | 2 +-
gnu/packages/video.scm | 4 +-
gnu/packages/wxwidgets.scm | 2 +-
gnu/packages/xdisorg.scm | 113 ++++++++++++++++++
gnu/packages/xfce.scm | 74 ++++++------
gnu/packages/zile.scm | 21 +++-
guix/build/download.scm | 129 ---------------------
guix/ui.scm | 27 +++--
nix/local.mk | 16 ++-
49 files changed, 677 insertions(+), 416 deletions(-)