[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, 15 Sep 2022 10:28:44 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit 3d297a0017210f1dd135592efb10846840a8af88
Merge: 279349209e 6737d8d324
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Sep 15 10:20:32 2022 -0400
Merge branch 'master' into staging
With resolved conflicts in:
gnu/local.mk
gnu/packages/freedesktop.scm
gnu/packages/gnuzilla.scm
NEWS | 23 +-
doc/guix.texi | 10 +-
etc/news.scm | 41 +
etc/teams.scm.in | 6 +-
gnu/build/secret-service.scm | 4 +-
gnu/home/services/shepherd.scm | 42 +-
gnu/local.mk | 17 +-
gnu/packages/admin.scm | 8 +-
gnu/packages/algebra.scm | 47 +-
gnu/packages/bash.scm | 44 +
gnu/packages/bioconductor.scm | 48 +
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/check.scm | 39 +-
gnu/packages/chromium.scm | 6 +-
gnu/packages/cmake.scm | 30 +-
gnu/packages/containers.scm | 18 +-
gnu/packages/cpp.scm | 14 +-
gnu/packages/cran.scm | 113 +
gnu/packages/crates-graphics.scm | 6 +
gnu/packages/crates-gtk.scm | 6 +
gnu/packages/cups.scm | 2 +-
gnu/packages/dezyne.scm | 4 +-
gnu/packages/emacs-xyz.scm | 312 +-
gnu/packages/emacs.scm | 64 +-
gnu/packages/embedded.scm | 11 +-
gnu/packages/engineering.scm | 10 +-
gnu/packages/enlightenment.scm | 15 +-
gnu/packages/esolangs.scm | 20 +
gnu/packages/fcitx.scm | 80 +-
gnu/packages/finance.scm | 21 +-
gnu/packages/fonts.scm | 6 +-
gnu/packages/fontutils.scm | 31 +-
gnu/packages/freedesktop.scm | 90 +-
gnu/packages/games.scm | 153 +-
gnu/packages/gcc.scm | 53 +-
gnu/packages/geo.scm | 179 +-
gnu/packages/glib.scm | 154 +-
gnu/packages/gnome-xyz.scm | 51 +-
gnu/packages/gnome.scm | 6150 +++++++++++---------
gnu/packages/gnucash.scm | 290 +-
gnu/packages/gnuzilla.scm | 4 +-
gnu/packages/gtk.scm | 363 +-
gnu/packages/guile-xyz.scm | 2 +-
gnu/packages/haskell-xyz.scm | 35 +-
gnu/packages/ibus.scm | 273 +-
gnu/packages/image-processing.scm | 2 +-
gnu/packages/ipfs.scm | 27 +-
gnu/packages/java.scm | 42 +-
gnu/packages/linux.scm | 43 +-
gnu/packages/lisp-xyz.scm | 259 +-
gnu/packages/lisp.scm | 8 +-
gnu/packages/lxde.scm | 2 +-
gnu/packages/machine-learning.scm | 16 +-
gnu/packages/messaging.scm | 107 +-
gnu/packages/music.scm | 6 +
gnu/packages/networking.scm | 38 +-
gnu/packages/ntp.scm | 12 +-
.../patches/cmake-curl-certificates-3.24.patch | 21 +
gnu/packages/patches/cmh-support-fplll.patch | 27 -
gnu/packages/patches/emacs-kv-fix-tests.patch | 30 +
.../patches/emacs-yasnippet-fix-tests.patch | 30 +-
.../patches/eog-update-libportal-usage.patch | 40 -
gnu/packages/patches/gdm-default-session.patch | 65 +-
gnu/packages/patches/gdm-elogind-support.patch | 21 +-
.../patches/gdm-pass-gdk-pixbuf-loader-env.patch | 13 +-
.../gdm-remove-hardcoded-xwayland-path.patch | 36 +-
.../gdm-wayland-session-wrapper-from-env.patch | 13 +-
gnu/packages/patches/geoclue-config.patch | 28 +-
.../patches/gnome-boxes-add-guix-logo.patch | 32 -
.../patches/gnome-builder-update-libportal.patch | 93 -
.../patches/gnome-screenshot-meson-0.60.patch | 39 -
.../patches/gnome-shell-polkit-autocleanup.patch | 50 -
...ct-introspection-absolute-shlib-path-1.72.patch | 173 +
.../patches/gobject-introspection-cc-1.72.patch | 15 +
gnu/packages/patches/gpaste-fix-paths.patch | 29 +-
gnu/packages/patches/gspell-dash-test.patch | 22 -
gnu/packages/patches/hedgewars-network-bsd.patch | 150 -
gnu/packages/patches/libgda-cve-2021-39359.patch | 33 +
gnu/packages/patches/libgda-fix-build.patch | 131 +
.../libgda-fix-missing-initialization.patch | 26 +
.../patches/libgda-skip-postgresql-tests.patch | 91 +
.../patches/nautilus-add-libportal-gtk3.patch | 61 -
.../patches/network-manager-plugin-path.patch | 38 +-
gnu/packages/patchutils.scm | 38 +
gnu/packages/pdf.scm | 19 +
gnu/packages/pkg-config.scm | 24 +
gnu/packages/python-science.scm | 13 +-
gnu/packages/python-web.scm | 7 +-
gnu/packages/python-xyz.scm | 58 +-
gnu/packages/qt.scm | 8 +-
gnu/packages/rsync.scm | 10 +-
gnu/packages/sdl.scm | 61 +-
gnu/packages/search.scm | 6 +-
gnu/packages/shellutils.scm | 33 +
gnu/packages/sphinx.scm | 35 +-
gnu/packages/tex.scm | 3 +-
gnu/packages/textutils.scm | 20 +
gnu/packages/uml.scm | 5 +-
gnu/packages/version-control.scm | 11 +-
gnu/packages/video.scm | 4 +-
gnu/packages/virtualization.scm | 11 +-
gnu/packages/web.scm | 10 +-
gnu/packages/webkit.scm | 48 +-
gnu/packages/wm.scm | 34 +-
gnu/packages/xdisorg.scm | 85 +-
gnu/packages/xfce.scm | 2 +-
gnu/packages/xorg.scm | 110 +-
gnu/services/security.scm | 25 +-
gnu/services/shepherd.scm | 27 +-
gnu/services/virtualization.scm | 1 +
gnu/services/web.scm | 66 +-
guix/build/emacs-build-system.scm | 20 +-
guix/build/emacs-utils.scm | 39 +-
guix/import/gnome.scm | 37 +-
nix/libstore/misc.cc | 8 -
nix/libstore/misc.hh | 4 -
nix/libstore/store-api.cc | 17 -
nix/libstore/store-api.hh | 12 -
118 files changed, 6779 insertions(+), 4900 deletions(-)
diff --cc gnu/local.mk
index cc96b77e03,cd41e6794d..d05f9ff557
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1243,7 -1243,7 +1241,6 @@@ dist_patch_DATA =
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
%D%/packages/patches/grub-efi-fat-serial-number.patch \
%D%/packages/patches/grub-setup-root.patch \
- %D%/packages/patches/gspell-dash-test.patch \
- %D%/packages/patches/gst-plugins-good-fix-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
%D%/packages/patches/guile-2.2-skip-so-test.patch \
diff --cc gnu/packages/freedesktop.scm
index 42fce62489,c7339eb00e..97d8bc3dbc
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -1605,18 -1648,17 +1648,17 @@@ which speak the Qualcomm MSM Interface
#:configure-flags
#~(list (string-append "--with-udev-base-dir=" #$output "/lib/udev"))))
(native-inputs
- (list gettext-minimal
- `(,glib "bin") ; for glib-mkenums
+ (list dbus
++ gettext-minimal
gobject-introspection
+ `(,glib "bin") ;for glib-mkenums
- gettext-minimal
pkg-config
- vala
- ;; For testing.
- dbus
python
python-dbus
- python-pygobject))
+ python-pygobject
+ vala))
(propagated-inputs
- (list glib)) ; required by mm-glib.pc
+ (list glib)) ;required by mm-glib.pc
(inputs
(list libgudev libmbim libqmi polkit))
(synopsis "Mobile broadband modems manager")
diff --cc gnu/packages/sphinx.scm
index cded866c90,2d53b7f3ac..8dad118f34
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@@ -380,11 -372,36 +380,38 @@@ Blog, News or Announcements section to
(home-page "https://github.com/executablebooks/sphinx-panels";)
(synopsis "Sphinx extension for creating panels in a grid layout")
(description
- "This package provides a sphinx extension for creating panels in a grid
layout.")
+ "This package provides a sphinx extension for creating panels in a
+grid layout. It is no longer maintained and users are encouraged to use
+@code{sphinx-design} instead.")
(license license:expat)))
+ (define-public python-sphinx-tabs
+ (package
+ (name "python-sphinx-tabs")
+ (version "3.4.1")
+ (home-page "https://github.com/executablebooks/sphinx-tabs";)
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "sphinx-tabs" version))
+ (sha256
+ (base32
+ "0cmqw5ck2jcxqyf5ibz543idspq0g0fdzxh3fpah1r0nhfg9z86j"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:tests? #f ;TODO: requires sphinx-testing and rinohtype
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'loosen-docutils-requirement
+ (lambda _
+ (substitute* "setup.py"
+ (("docutils~=0\\.18\\.0")
+ "docutils>=0.17.0")))))))
+ (propagated-inputs
+ (list python-docutils python-pygments python-sphinx))
+ (synopsis "Tabbed views for Sphinx")
+ (description
+ "Create tabbed content in Sphinx documentation when building HTML.")
+ (license license:expat)))
+
(define-public python-sphinxcontrib-programoutput
(package
(name "python-sphinxcontrib-programoutput")