[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, 21 Jul 2022 17:55:27 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit abea091dbef2d44e6eb46bd2413bdf917e14d095
Merge: 3b20467807 3f171587bc
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Jul 21 23:52:47 2022 +0200
Merge branch 'master' into staging
doc/contributing.texi | 9 +-
doc/guix.texi | 196 ++++++++++++++++-
gnu/build/chromium-extension.scm | 18 +-
gnu/home/services.scm | 55 +++--
gnu/home/services/shells.scm | 19 +-
gnu/local.mk | 4 +-
gnu/packages/admin.scm | 26 ++-
gnu/packages/aidc.scm | 11 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/bioconductor.scm | 19 ++
gnu/packages/c.scm | 107 ++++-----
gnu/packages/calendar.scm | 9 +-
gnu/packages/chicken.scm | 51 +++++
gnu/packages/chromium.scm | 6 +-
gnu/packages/clojure.scm | 1 +
gnu/packages/commencement.scm | 9 +-
gnu/packages/compression.scm | 24 +-
gnu/packages/diffoscope.scm | 16 +-
gnu/packages/docker.scm | 6 +-
gnu/packages/emacs-xyz.scm | 101 +++++----
gnu/packages/engineering.scm | 12 +-
gnu/packages/finance.scm | 122 +++++++++++
gnu/packages/fribidi.scm | 4 +-
gnu/packages/games.scm | 40 ----
gnu/packages/geo.scm | 43 ++--
gnu/packages/gnome.scm | 38 ++++
gnu/packages/gps.scm | 4 +-
gnu/packages/gstreamer.scm | 8 +-
gnu/packages/guile-xyz.scm | 19 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/image-viewers.scm | 21 +-
gnu/packages/image.scm | 4 +-
gnu/packages/irc.scm | 13 +-
gnu/packages/jami.scm | 2 +-
gnu/packages/kde-multimedia.scm | 17 +-
gnu/packages/kde-utils.scm | 7 +-
gnu/packages/linux.scm | 57 ++---
gnu/packages/lisp-xyz.scm | 104 +++++++++
gnu/packages/maths.scm | 37 ++--
gnu/packages/monitoring.scm | 61 ++++++
gnu/packages/music.scm | 4 +-
gnu/packages/networking.scm | 30 ++-
gnu/packages/node-xyz.scm | 243 +++++++++++++++++++++
gnu/packages/package-management.scm | 12 +-
.../patches/containerd-create-pid-file.patch | 31 +++
...libgeotiff-adapt-test-script-for-proj-6.2.patch | 63 ------
gnu/packages/plotutils.scm | 4 +-
gnu/packages/python-science.scm | 4 +-
gnu/packages/python-web.scm | 74 +++++++
gnu/packages/python-xyz.scm | 52 ++++-
gnu/packages/qt.scm | 143 ++++++------
gnu/packages/slang.scm | 92 ++++++--
gnu/packages/sqlite.scm | 6 +-
gnu/packages/tex.scm | 48 ++++
gnu/packages/text-editors.scm | 15 +-
gnu/packages/toys.scm | 41 ++++
gnu/packages/version-control.scm | 37 +++-
gnu/packages/video.scm | 18 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/web.scm | 18 +-
gnu/packages/wm.scm | 57 +++++
gnu/packages/xfce.scm | 24 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/docker.scm | 5 +-
gnu/services/guix.scm | 2 -
gnu/services/networking.scm | 47 ++--
gnu/system.scm | 1 +
gnu/tests/guix.scm | 21 +-
guix/import/egg.scm | 9 +-
guix/import/pypi.scm | 8 +-
guix/import/texlive.scm | 20 +-
guix/import/utils.scm | 2 +
guix/monad-repl.scm | 64 +++++-
guix/scripts/home.scm | 64 ++++--
guix/scripts/import/texlive.scm | 25 ++-
guix/scripts/package.scm | 33 +--
guix/scripts/shell.scm | 5 +
guix/scripts/system.scm | 67 ++++--
guix/upstream.scm | 18 +-
guix/utils.scm | 6 +-
tests/guix-home.sh | 8 +
82 files changed, 2046 insertions(+), 695 deletions(-)
diff --cc gnu/packages/qt.scm
index 762c63cace,ae68317492..beba03936a
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -84,9 -85,9 +85,10 @@@
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages maths)
+ #:use-module (gnu packages markup)
#:use-module (gnu packages networking)
#:use-module (gnu packages ninja)
+ #:use-module (gnu packages node)
#:use-module (gnu packages nss)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages pcre)