From 62500af80ab2d17e45ad02b619e7de2bb7b9bdaa Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 5 Jan 2026 21:25:43 +0100 Subject: [PATCH] gnu: python-dbus: Rename to python-dbus-1.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-dbus): Rename to… (python-dbus-1.2): … this. (python-notify2, python-gatt, python2-dbus): Adapt references. * gnu/packages/audio.scm (cable): Likewise. * gnu/packages/bittorrent.scm (deluge): Likewise. * gnu/packages/connman.scm (econnman): Likewise. * gnu/packages/cups.scm (hplip): Likewise. * gnu/packages/enlightenment.scm (python-efl): Likewise. * gnu/packages/freedesktop.scm (modem-manager, telepathy-idle): Likewise. * gnu/packages/gnome.scm (gtg, system-config-printer, libsecret, upower) (mutter, network-manager, gnome-bluetooth, gnome-shell, terminator) (gnome-remote-desktop): Likewise. * gnu/packages/gpodder.scm (gpodder): Likewise. * gnu/packages/ibus.scm (ibus): Likewise. * gnu/packages/maths.scm (veusz): Likewise. * gnu/packages/matrix.scm (pantalaimon): Likewise. * gnu/packages/messaging.scm (pidgin, gajim): Likewise. * gnu/packages/mpd.scm (jack-select, mididings, a2jmididquodlibet): Likewise. * gnu/packages/password-utils.scm (secretsd): Likewise. * gnu/packages/stenography.scm (plover): Likewise. * gnu/packages/sugar.scm (sugar-datastore, sugar-toolkit-gtk3) (sugar-portfolio-activity): Likewise. * gnu/packages/video.scm (python-yewtube): Likewise. * gnu/packages/xdisorg.scm (autokey): Likewise. * gnu/packages/xfce.scm (catfish): Likewise. * gnu/packages/xorg.scm (xpra): Likewise. Change-Id: I19218743260175f1117b8e213131a3b1495c6c48 Signed-off-by: Liliana Marie Prikler --- gnu/packages/audio.scm | 4 ++-- gnu/packages/bittorrent.scm | 2 +- gnu/packages/connman.scm | 2 +- gnu/packages/cups.scm | 2 +- gnu/packages/enlightenment.scm | 2 +- gnu/packages/freedesktop.scm | 4 ++-- gnu/packages/gnome.scm | 22 +++++++++++----------- gnu/packages/gpodder.scm | 2 +- gnu/packages/ibus.scm | 2 +- gnu/packages/maths.scm | 2 +- gnu/packages/matrix.scm | 2 +- gnu/packages/messaging.scm | 4 ++-- gnu/packages/mpd.scm | 2 +- gnu/packages/music.scm | 8 ++++---- gnu/packages/password-utils.scm | 2 +- gnu/packages/python-xyz.scm | 10 +++++----- gnu/packages/stenography.scm | 2 +- gnu/packages/sugar.scm | 6 +++--- gnu/packages/video.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- gnu/packages/xfce.scm | 2 +- gnu/packages/xorg.scm | 2 +- 22 files changed, 44 insertions(+), 44 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3049231fcc5..087b0cb8f8e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1682,7 +1682,7 @@ plugins are provided.") (string-append #$output "/share/applications/"))))))) (inputs (list python - python-dbus + python-dbus-1.2 python-jack-client python-pyqt-6 python-requests)) @@ -3141,7 +3141,7 @@ synchronous execution of all clients, and low latency operation.") expat libsamplerate opus - python-dbus + python-dbus-1.2 readline)) (native-inputs (list pkg-config)) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 17e04c5d6b0..e35bcb6cf2d 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -659,7 +659,7 @@ the following features: nss-certs python-pycairo python-chardet - python-dbus + python-dbus-1.2 python-mako python-pygobject python-pillow diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 9f6384708e6..cdac9c9095e 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -144,7 +144,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.") (list bash-minimal ;for wrap-program efl python-wrapper - python-dbus + python-dbus-1.2 python-efl)) (home-page "https://www.enlightenment.org") (synopsis "Connman User Interface written using the EFL") diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index ad9779cb2e6..88af019fbc8 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -756,7 +756,7 @@ should only be used as part of the Guix cups-pk-helper service.") libjpeg-turbo libusb python - python-dbus + python-dbus-1.2 python-pygobject python-pyqt python-wrapper diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 8637ab1c7c9..9ad0ce85efd 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -441,7 +441,7 @@ embedded systems.") python-cython-0 python-pytest python-setuptools)) - (inputs (list efl python-dbus python-packaging)) + (inputs (list efl python-dbus-1.2 python-packaging)) (home-page "https://www.enlightenment.org/") (synopsis "Python bindings for EFL") (description diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a80f1f05834..0127ddfe71f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2078,7 +2078,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") libxslt ;for xsltproc pkg-config python-minimal - python-dbus ;for test + python-dbus-1.2 ;for test python-pygobject ;for test vala)) (propagated-inputs @@ -2272,7 +2272,7 @@ different sorts of messages in different formats.") (base32 "02wb61h2k3hhis5y2xi5rhc6pmikd13x722hk620sqb9b3m5pn3s")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool pkg-config)) - (inputs (list libxslt python-wrapper python-dbus)) + (inputs (list libxslt python-wrapper python-dbus-1.2)) (propagated-inputs (list telepathy-glib)) (home-page "https://telepathy.freedesktop.org/") (synopsis "Telepathy IRC connection manager") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b13216c5c85..1586f62db12 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2827,7 +2827,7 @@ and how they are displayed (View).") gtksourceview-4 pango python - python-dbus + python-dbus-1.2 python-liblarch python-lxml python-pycairo @@ -2993,7 +2993,7 @@ guidelines.") python cups gtk+ - python-dbus + python-dbus-1.2 python-pygobject python-pycups python-requests @@ -5237,7 +5237,7 @@ and the GLib main loop, to integrate well with GNOME applications.") libxslt pkg-config python - python-dbus + python-dbus-1.2 python-pygobject-3.50 vala)) (propagated-inputs @@ -5855,7 +5855,7 @@ faster results and to avoid unnecessary server load.") pkg-config python ;; For tests. - python-dbus + python-dbus-1.2 python-dbusmock-minimal python-packaging python-pygobject @@ -8005,7 +8005,7 @@ to display dialog boxes from the commandline and shell scripts.") libxcursor ;for XCURSOR_PATH pipewire python - python-dbus + python-dbus-1.2 python-dbusmock wireplumber-minimal)) (propagated-inputs @@ -8394,7 +8394,7 @@ users.") libxslt perl pkg-config - python-dbus + python-dbus-1.2 python-pygobject-3.50 python-wrapper vala)) @@ -9147,7 +9147,7 @@ usage and information about running processes.") libxml2 pkg-config python - python-dbus)) + python-dbus-1.2)) (propagated-inputs ;; These are all required by the gnome-bluetooth .pc file. (list glib @@ -9157,7 +9157,7 @@ usage and information about running processes.") (list eudev gsound libnotify - python-dbus + python-dbus-1.2 upower)) (synopsis "GNOME Bluetooth subsystem") (home-page "https://wiki.gnome.org/Projects/GnomeBluetooth") @@ -9450,7 +9450,7 @@ printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \ perl pkg-config python - python-dbus + python-dbus-1.2 python-dbusmock ruby-sass sassc @@ -12146,7 +12146,7 @@ advanced image management tool") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) ("python" ,python-wrapper) - ("python-dbus" ,python-dbus) + ("python-dbus" ,python-dbus-1.2) ("python-notify2" ,python-notify2) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) @@ -14017,7 +14017,7 @@ historical battery usage and related statistics.") mutter pkg-config python - python-dbus + python-dbus-1.2 python-pygobject xdg-desktop-portal-gnome)) (home-page "https://gitlab.gnome.org/GNOME/gnome-remote-desktop") diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 2cab1d53a4d..5bfc66ccd48 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -113,7 +113,7 @@ python-pygobject python-pycairo python-requests - python-dbus + python-dbus-1.2 python-html5lib python-mutagen python-mygpoclient diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index d6fe071d8e9..015b4606dba 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -276,7 +276,7 @@ may also simplify input method development.") (prepend gtk pango python - python-dbus + python-dbus-1.2 python-pygobject-3.50))) (native-search-paths (cons (search-path-specification diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 07eedbede0e..9f86ba2250b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3888,7 +3888,7 @@ ASCII text files using Gmsh's own scripting language.") (inputs (list bash-minimal ghostscript ;optional, for EPS/PS output - python-dbus + python-dbus-1.2 python-h5py ;optional, for HDF5 data python-pyqt-6 qtbase diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index e2936bc3d0c..1b591c6fc31 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -467,7 +467,7 @@ asyncio_mode = auto"))))) python-attrs python-cachetools python-click - python-dbus + python-dbus-1.2 python-janus python-keyring python-logbook diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c46cd87963d..25725c60944 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -999,7 +999,7 @@ authentication.") pango perl python-wrapper - python-dbus + python-dbus-1.2 silc-toolkit sqlite startup-notification @@ -1295,7 +1295,7 @@ of xmpppy.") libxscrnsaver network-manager python-css-parser - python-dbus + python-dbus-1.2 python-emoji python-gssapi python-idna diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 171e5483803..f44f87ecdc9 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -514,7 +514,7 @@ other MPD frontends.") (inputs (list bash-minimal python - python-dbus + python-dbus-1.2 python-mpd2 python-mutagen python-pygobject)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3aad596b62f..5b2be076d20 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3652,7 +3652,7 @@ can connect to any JACK port and record the output into a stereo WAV file.") (list pkg-config)) (inputs (list alsa-lib - python-dbus + python-dbus-1.2 python-pygobject python-pyudev python-pyxdg @@ -4648,7 +4648,7 @@ standard MIDI file with the csvmidi program.") jack-2 python `(,python "tk") - python-dbus + python-dbus-1.2 python-decorator python-pyinotify python-pyliblo @@ -7714,7 +7714,7 @@ It is provided as an LV2 plugin and as a standalone Jack application.") dbus jack-1 python - python-dbus)) + python-dbus-1.2)) (native-inputs (list pkg-config)) (synopsis "ALSA sequencer to JACK MIDI bridging") @@ -7902,7 +7902,7 @@ streaming audio server.") libsoup-minimal python python-cheetah - python-dbus + python-dbus-1.2 python-feedparser python-gst python-iniconfig diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index ec1f55ba7d4..dcac2488184 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1480,7 +1480,7 @@ winner of the 2015 Password Hashing Competition.") (wrap-program (string-append #$output "/bin/secretsd") `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))))))) - (inputs (list python-dbus python-platformdirs python-cryptography + (inputs (list python-dbus-1.2 python-platformdirs python-cryptography python-pygobject)) (native-inputs (list bash-minimal python-setuptools python-wheel)) (home-page "https://github.com/grawity/secretsd") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f442f7731fd..5eee6e38d14 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15242,7 +15242,7 @@ It is based on PyGI, the Python GObject Introspection bindings, which is the recommended way to use GLib from Python.") (license license:lgpl2.1+))) -(define-public python-dbus +(define-public python-dbus-1.2 (package (name "python-dbus") (version "1.2.18") @@ -15280,7 +15280,7 @@ implementation of D-Bus.") (build-system python-build-system) (arguments `(#:tests? #f)) ; tests depend on system state (propagated-inputs - (list python-dbus)) + (list python-dbus-1.2)) (home-page "https://bitbucket.org/takluyver/pynotify2") (synopsis "Python interface to D-Bus notifications") (description @@ -35400,7 +35400,7 @@ for serialization, which has many drawbacks.") "0fjf066jixk30fr8xwfalwfnhqpr56yv0cccyypnx2qp9bi9svb2")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ; No tests upstream. - (propagated-inputs (list python-dbus python-pygobject)) + (propagated-inputs (list python-dbus-1.2 python-pygobject)) (native-inputs (list python-setuptools)) (home-page "https://github.com/getsenic/gatt-python") (synopsis "Bluetooth GATT SDK for Python") @@ -41698,12 +41698,12 @@ you do not want to store entirely on disk or on memory.") (license license:gpl3))) (define-public python2-dbus - (package/inherit python-dbus + (package/inherit python-dbus-1.2 (name "python2-dbus") (inputs `(("python" ,python-2) ("libxcrypt" ,libxcrypt) ;required by Python.h ,@(alist-delete "python" - (package-inputs python-dbus)))) + (package-inputs python-dbus-1.2)))) (arguments `(#:configure-flags '("PYTHON_VERSION=2"))))) diff --git a/gnu/packages/stenography.scm b/gnu/packages/stenography.scm index 3f0979c3063..61cd299b33e 100644 --- a/gnu/packages/stenography.scm +++ b/gnu/packages/stenography.scm @@ -122,7 +122,7 @@ (list bash-minimal dbus python-appdirs - python-dbus + python-dbus-1.2 python-hidapi python-plover-stroke python-pyqt diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 98302c25c20..5933686fad8 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -288,7 +288,7 @@ activities and other Sugar components.") python sugar-toolkit-gtk3)) (propagated-inputs - (list python-dbus + (list python-dbus-1.2 python-pygobject python-xapian-bindings)) (native-inputs @@ -386,7 +386,7 @@ and metadata, and the journal with querying and full text search.") ;; be propagated. python-pycairo python-dateutil - python-dbus + python-dbus-1.2 python-decorator python-pygobject python-six @@ -1057,7 +1057,7 @@ life with forces (think gravity, Newton!), friction (scrrrrape), and inertia gtk+ gstreamer gst-plugins-base - python-dbus + python-dbus-1.2 python-pygobject sugar-datastore sugar-toolkit-gtk3 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5eb6abf8fa7..3132d715e42 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -6711,7 +6711,7 @@ can also directly record to WebM or MP4 if you prefer.") (lambda _ (setenv "HOME" (getcwd))))))) (native-inputs - (list python-dbus + (list python-dbus-1.2 python-pygobject python-pytest python-setuptools)) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9cd89ee8e82..4733b79a137 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -250,7 +250,7 @@ kdialog libappindicator libnotify - python-dbus + python-dbus-1.2 python-ipython python-pygobject python-pyinotify diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 42ec7e5ae28..b49cc81bdf8 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -244,7 +244,7 @@ to share commonly used Xfce widgets among the Xfce applications.") pkg-config python)) (inputs (list bash-minimal which xfconf xdg-utils)) - (propagated-inputs (list gtk+ python-dbus python-pexpect python-pycairo + (propagated-inputs (list gtk+ python-dbus-1.2 python-pexpect python-pycairo python-pygobject)) (home-page "https://docs.xfce.org/apps/catfish/") (synopsis "File searching tool for Xfce") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b05d3ed3adc..f17dde2aa7f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6567,7 +6567,7 @@ basic eye-candy effects.") python-pyopengl ; Drawing acceleration. python-pyopengl-accelerate ; Same. python-paramiko ; Tunneling over SSH. - python-dbus ; For desktop notifications. + python-dbus-1.2 ; For desktop notifications. dbus ; For dbus-launch command. python-lz4 ; Faster compression than zlib. python-netifaces