75 files changed, 345 insertions(+), 348 deletions(-)

M gnu/packages/arcan.scm
M gnu/packages/astronomy.scm
M gnu/packages/axoloti.scm
M gnu/packages/bioinformatics.scm
M gnu/packages/bittorrent.scm
M gnu/packages/boost.scm
M gnu/packages/build-tools.scm
M gnu/packages/code.scm
M gnu/packages/compression.scm
M gnu/packages/cpp.scm
M gnu/packages/cran.scm
M gnu/packages/crypto.scm
M gnu/packages/curl.scm
M gnu/packages/databases.scm
M gnu/packages/disk.scm
M gnu/packages/django.scm
M gnu/packages/electronics.scm
M gnu/packages/elm.scm
M gnu/packages/emacs-xyz.scm
M gnu/packages/emacs.scm
M gnu/packages/emulators.scm
M gnu/packages/engineering.scm
M gnu/packages/fediverse.scm
M gnu/packages/firmware.scm
M gnu/packages/fonts.scm
M gnu/packages/fontutils.scm
M gnu/packages/games.scm
M gnu/packages/ghostscript.scm
M gnu/packages/gimp.scm
M gnu/packages/gl.scm
M gnu/packages/gnome-xyz.scm
M gnu/packages/gnome.scm
M gnu/packages/golang-crypto.scm
M gnu/packages/golang-web.scm
M gnu/packages/golang-xyz.scm
M gnu/packages/graph.scm
M gnu/packages/gtk.scm
M gnu/packages/guile.scm
M gnu/packages/hardware.scm
M gnu/packages/haskell-check.scm
M gnu/packages/image-viewers.scm
M gnu/packages/ipfs.scm
M gnu/packages/linux.scm
M gnu/packages/luanti.scm
M gnu/packages/machine-learning.scm
M gnu/packages/mail.scm
M gnu/packages/maths.scm
M gnu/packages/messaging.scm
M gnu/packages/minetest.scm
M gnu/packages/monitoring.scm
M gnu/packages/music.scm
M gnu/packages/ncdu.scm
M gnu/packages/networking.scm
M gnu/packages/profiling.scm
M gnu/packages/pypy.scm
M gnu/packages/python-compression.scm
M gnu/packages/python-web.scm
M gnu/packages/python-xyz.scm
M gnu/packages/qt.scm
M gnu/packages/ruby-xyz.scm
M gnu/packages/rust-apps.scm
M gnu/packages/serialization.scm
M gnu/packages/shells.scm
M gnu/packages/sycl.scm
M gnu/packages/syncthing.scm
M gnu/packages/terminals.scm
M gnu/packages/textutils.scm
M gnu/packages/tree-sitter.scm
M gnu/packages/version-control.scm
M gnu/packages/video.scm
M gnu/packages/web.scm
M gnu/packages/wm.scm
M gnu/packages/xdisorg.scm
M gnu/packages/xfig.scm
M gnu/packages/xml.scm

@@ 316,5 316,5 @@ as a window under Arcan.")
     (license (list license:bsd-3 license:expat))))
 
 ;; Package was merged into arcan in upstream.
-(define-public arcan-wayland
-  (deprecated-package "arcan-wayland" arcan))
+(define-deprecated-package arcan-wayland
+  arcan)

@@ 645,8 645,8 @@ accurately in real time at any rate desired.")
 @end itemize")
       (license license:gpl2+))))
 
-(define-public celestia-gtk
-  (deprecated-package "celestia-gtk" celestia))
+(define-deprecated-package celestia-gtk
+  celestia)
 
 (define-public cfitsio
   (package


@@ 1045,8 1045,8 @@ viewer: panning and zooming windows, star catalog access, cuts, star
 pick/FWHM, thumbnails, etc.")
 (license license:bsd-3)))
 
-(define-public ginga-qt5
-  (deprecated-package "ginga-qt5" ginga))
+(define-deprecated-package ginga-qt5
+  ginga)
 
 (define-public glnemo2
   (package


@@ 9496,9 9496,9 @@ between image and reference catalogs.  Currently only aligning images with
 @url{https://aeolus.services, Aeolus}")
     (license license:expat)))
 
-(define-public python-webbpsf
-  ;; See <https://github.com/spacetelescope/webbpsf/pull/951>
-  (deprecated-package "python-webbpsf" python-stpsf))
+;; See <https://github.com/spacetelescope/webbpsf/pull/951>
+(define-deprecated-package python-webbpsf
+  python-stpsf)
 
 (define-public python-wiimatch
   (package

@@ 662,5 662,5 @@ with some layout changes and added features.
 
 This package provides the patcher application.")))
 
-(define-public axoloti-patcher-next
-  (deprecated-package "axoloti-patcher-next" ksoloti-patcher))
+(define-deprecated-package axoloti-patcher-next
+  ksoloti-patcher)

@@ 2900,8 2900,8 @@ biological activities from omics data within a unified framework.")
     (license license:bsd-3)))
 
 ;; See: <https://github.com/scverse/decoupler/blob/main/CHANGELOG.md#200>
-(define-public python-decoupler-py
-  (deprecated-package "python-decoupler-py" python-decoupler))
+(define-deprecated-package python-decoupler-py
+  python-decoupler)
 
 (define-public python-demuxem
   (package


@@ 6027,8 6027,8 @@ subgroups.")
     (description "muon is a multimodal omics Python framework.")
     (license license:bsd-3)))
 
-(define-public python-pyega3
-  (deprecated-package "python-pyega3" python-ega-download-client))
+(define-deprecated-package python-pyega3
+  python-ega-download-client)
 
 (define-public python-pysam
   (package


@@ 17388,8 17388,8 @@ lowly expressed transcripts.")
 mapped paired-end sequencing reads.")
     (license license:gpl3+)))
 
-(define-public fanc
-  (deprecated-package "fanc" python-fanc))
+(define-deprecated-package fanc
+  python-fanc)
 
 (define-public python-genomic-regions
   (package


@@ 18641,8 18641,8 @@ report will provide an intuitive visual overview about the development of
 variant abundance over time and location.")
     (license license:gpl3+)))
 
-(define-public pigx-sars-cov2-ww
-  (deprecated-package "pigx-sars-cov2-ww" pigx-sars-cov-2))
+(define-deprecated-package pigx-sars-cov2-ww
+  pigx-sars-cov-2)
 
 (define-public pigx
   (package

@@ 564,8 564,8 @@ features.")
        (modify-inputs (package-inputs base)
          (delete "qtsvg"))))))
 
-(define-public qbittorrent-nox
-  (deprecated-package "qbittorrent-nox" qbittorrent-no-x))
+(define-deprecated-package qbittorrent-nox
+  qbittorrent-no-x)
 
 (define-public qbittorrent-enhanced
   (package


@@ 602,8 602,8 @@ the following features:
     (arguments (package-arguments qbittorrent-no-x))
     (inputs (package-inputs qbittorrent-no-x))))
 
-(define-public qbittorrent-enhanced-nox
-  (deprecated-package "qbittorrent-enhanced-nox" qbittorrent-enhanced-no-x))
+(define-deprecated-package qbittorrent-enhanced-nox
+  qbittorrent-enhanced-no-x)
 
 (define-public deluge
   (package

@@ 226,8 226,8 @@ across a broad spectrum of applications.")
                (base32
                 "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34")))))))
 
-(define-public boost-with-python3
-  (deprecated-package "boost-with-python3" boost))
+(define-deprecated-package boost-with-python3
+  boost)
 
 (define-public boost-static
   (package

@@ 1298,5 1298,5 @@ The Waf Book and in the API docs
 
 ;; waf is the final program no need to prefix it with "python-", the same way
 ;; as meson or ninja which are written in Python as well.
-(define-public python-waf
-  (deprecated-package "python-waf" waf))
+(define-deprecated-package python-waf
+  waf)

@@ 1134,5 1134,5 @@ requirements is not met.")
     (properties '((lint-hidden-cpe-vendors . ("vmware"))))
     (license license:expat)))
 
-(define-public python-xenon
-  (deprecated-package "python-xenon" xenon))
+(define-deprecated-package python-xenon
+  xenon)

@@ 2437,8 2437,8 @@ with @code{deflate} but offers more dense compression.
 The specification of the Brotli Compressed Data Format is defined in RFC 7932.")
     (license license:expat)))
 
-(define-public google-brotli
-  (deprecated-package "google-brotli" brotli))
+(define-deprecated-package google-brotli
+  brotli)
 
 (define-public java-brotli
   (package

@@ 1263,8 1263,8 @@ data transfer object.")
 intuitive syntax and trivial integration.")
     (license license:expat)))
 
-(define-public json-modern-cxx
-  (deprecated-package "json-modern-cxx" nlohmann-json))
+(define-deprecated-package json-modern-cxx
+  nlohmann-json)
 
 (define-public jthread
   (let ((commit "0fa8d394254886c555d6faccd0a3de819b7d47f8")

@@ 39633,8 39633,8 @@ integrative non-negative matrix factorization to identify shared and
 dataset-specific factors.")
     (license license:gpl3)))
 
-(define-public r-liger
-  (deprecated-package "r-liger" r-rliger))
+(define-deprecated-package r-liger
+  r-rliger)
 
 (define-public r-harmony
   (package


@@ 50195,8 50195,8 @@ other R users.")
     (license license:gpl3)))
 
 ;; This is for r-seurat5
-(define-public r-seurat5object
-  (deprecated-package "r-seurat5object" r-seuratobject))
+(define-deprecated-package r-seurat5object
+  r-seuratobject)
 
 (define-public r-seurat
   (package


@@ 50276,8 50276,8 @@ discovery of differentially expressed genes and markers.")
 
 ;; Seurat5 is only available via the seurat5 branch.  It will replace r-seurat
 ;; eventually once it has been released to CRAN.
-(define-public r-seurat5
-  (deprecated-package "r-seurat5" r-seurat))
+(define-deprecated-package r-seurat5
+  r-seurat)
 
 (define-public r-seuratdisk
   (let ((commit "877d4e18ab38c686f5db54f8cd290274ccdbe295")

@@ 1367,8 1367,8 @@ API.")
     (home-page "https://matrix.org/docs/projects/other/olm/")
     (license license:asl2.0)))
 
-(define-public libolm
-  (deprecated-package "libolm" olm))
+(define-deprecated-package libolm
+  olm)
 
 (define-public python-olm
   (package

@@ 179,7 179,8 @@ tunneling, and so on.")
     (license (license:non-copyleft "file://COPYING"
                                    "See COPYING in the distribution."))))
 
-(define-public gnurl (deprecated-package "gnurl" curl))
+(define-deprecated-package gnurl
+  curl)
 
 (define-public curl-ssh
   (package/inherit curl

@@ 2085,8 2085,8 @@ supports editing, navigation, and querying of recutils database files
 including field and record folding.")
     (license license:gpl3+)))
 
-(define-public emacs-recutils
-  (deprecated-package "emacs-recutils" emacs-rec-mode))
+(define-deprecated-package emacs-recutils
+  emacs-rec-mode)
 
 (define-public rocksdb
   (package


@@ 5038,8 5038,8 @@ reasonable substitute.")
      "This package provides a Python interface to the Redis key-value store.")
     (license license:expat)))
 
-(define-public python-aioredis
-  (deprecated-package "python-aioredis" python-redis))
+(define-deprecated-package python-aioredis
+  python-redis)
 
 (define-public python-rq
   (package

@@ 1052,8 1052,8 @@ a card with a smaller capacity than stated.")
     (description "This package provides @code{parted} bindings for Python.")
     (license license:gpl2+)))
 
-(define-public python-parted
-  (deprecated-package "python-parted" python-pyparted))
+(define-deprecated-package python-parted
+  python-pyparted)
 
 (define-public duperemove
   (package

@@ 1655,8 1655,8 @@ Django projects, which allows association of a number of tags with any
 provides features like a Web-browsable API and authentication policies.")
     (license license:bsd-2)))
 
-(define-public python-djangorestframework
-  (deprecated-package "python-djangorestframework" python-django-rest-framework))
+(define-deprecated-package python-djangorestframework
+  python-django-rest-framework)
 
 (define-public python-django-sekizai
   (package

@@ 1051,8 1051,8 @@ which allows one to install the M8 firmware on any Teensy.")
     (synopsis
      (string-append (package-synopsis nextpnr) " Cli only version."))))
 
-(define-public nextpnr-ice40
-  (deprecated-package "nextpnr-ice40" nextpnr))
+(define-deprecated-package nextpnr-ice40
+  nextpnr)
 
 (define-public ngspice
   ;; The ngspice executables (see libngpsice above.)

@@ 174,8 174,8 @@ such as @command{elm make} and @command{elm repl}.")
     (license license:bsd-3)))
 
 ;; The 'elm' package used to be called 'elm-compiler'.
-(define-public elm-compiler
-  (deprecated-package "elm-compiler" elm))
+(define-deprecated-package elm-compiler
+  elm)
 
 (define-public elm-core
   (package

@@ 3355,8 3355,8 @@ of tasks, including version control, task management, and regex-based
 replacement.")
       (license license:gpl3+))))
 
-(define-deprecated/public emacs-unpackaged-el emacs-unpackaged
-  (deprecated-package "emacs-unpackaged-el" emacs-unpackaged))
+(define-deprecated-package emacs-unpackaged-el
+  emacs-unpackaged)
 
 (define-public emacs-haskell-mode
   (let ((commit "e9c356739310332afe59b10ffa2e6c3e76f124e3")


@@ 5924,8 5924,8 @@ searches.  Unlike @code{emacs-wiki.el}, it can be combined with any format.")
     (home-page "https://github.com/hexmode/mediawiki-el")
     (license license:gpl3+)))
 
-(define-deprecated/public emacs-mediawiki-el emacs-mediawiki
-  (deprecated-package "emacs-mediawiki-el" emacs-mediawiki))
+(define-deprecated-package emacs-mediawiki-el
+  emacs-mediawiki)
 
 (define-public emacs-bm
   (package


@@ 6184,8 6184,8 @@ Language (CSL), an XML-based, open format to describe the formatting
 of bibliographic references.")
     (license license:gpl3+)))
 
-(define-deprecated/public emacs-citeproc-el emacs-citeproc
-  (deprecated-package "emacs-citeproc-el" emacs-citeproc))
+(define-deprecated-package emacs-citeproc-el
+  emacs-citeproc)
 
 (define-public emacs-corfu
   (package


@@ 8918,8 8918,8 @@ If you are using Guix shell with @file{manifest.scm}, the
       (description "This package lets you switch Ruby versions using chruby.")
       (license license:gpl3+))))
 
-(define-deprecated/public emacs-chruby-el emacs-chruby
-  (deprecated-package "emacs-chruby-el" emacs-chruby))
+(define-deprecated-package emacs-chruby-el
+  emacs-chruby)
 
 ;; Package has no release.  Version is extracted from "Version:" keyword in
 ;; main file.


@@ 13936,8 13936,8 @@ It is built on top of the custom theme support in Emacs 24 or later.")
 variants.")
     (license license:gpl3+)))
 
-(define-deprecated/public emacs-moe-theme-el emacs-moe-theme
-  (deprecated-package "emacs-moe-theme-el" emacs-moe-theme))
+(define-deprecated-package emacs-moe-theme-el
+  emacs-moe-theme)
 
 (define-public emacs-color-theme-sanityinc-tomorrow
   (package


@@ 16791,8 16791,8 @@ unique file names you need this package here.")
 individual file buffers.")
     (license license:gpl3+)))
 
-(define-deprecated/public emacs-undohist-el emacs-undohist
-  (deprecated-package "emacs-undohist-el" emacs-undohist))
+(define-deprecated-package emacs-undohist-el
+  emacs-undohist)
 
 (define-public emacs-eprime
   (let ((commit "17a481af26496be91c07139a9bfc05cfe722506f"))


@@ 21463,8 21463,8 @@ This is based on Frank Terbeck's @code{gnus-article-treat-patch.el} but has
 been adapted to also work with mu4e.")
       (license license:gpl3+))))
 
-(define-public emacs-mu4e-patch
-  (deprecated-package "emacs-mu4e-patch" emacs-message-view-patch))
+(define-deprecated-package emacs-mu4e-patch
+  emacs-message-view-patch)
 
 (define-public emacs-pretty-mode
   (package


@@ 22305,8 22305,8 @@ DefaultEncrypt, please refer to the home page or read the comments in the
 source file, @file{jl-encrypt.el}.")
     (license license:gpl3+)))
 
-(define-public emacs-default-encrypt
-  (deprecated-package "emacs-default-encrypt" emacs-defaultencrypt))
+(define-deprecated-package emacs-default-encrypt
+  emacs-defaultencrypt)
 
 (define-public emacs-deflate
   (package


@@ 26149,8 26149,8 @@ buffer, and, by virtue of this extension, do so using the Emacs formatting
 rules for that language.")
     (license license:bsd-2)))
 
-(define-deprecated/public emacs-scratch-el emacs-scratch
-  (deprecated-package "emacs-scratch-el" emacs-scratch))
+(define-deprecated-package emacs-scratch-el
+  emacs-scratch)
 
 (define-public emacs-kv
   (package


@@ 28554,8 28554,8 @@ mode.")
 for operating over the contents of Emacs buffers.")
       (license license:gpl3+))))
 
-(define-deprecated/public emacs-m-buffer-el emacs-m-buffer
-  (deprecated-package "emacs-m-buffer-el" emacs-m-buffer))
+(define-deprecated-package emacs-m-buffer-el
+  emacs-m-buffer)
 
 (define-public emacs-let-alist
   (package


@@ 29741,8 29741,8 @@ repository, @code{magit-org-todos} will create a section in your Magit status
 buffer with each of your todos.")
     (license license:gpl3+)))
 
-(define-deprecated/public emacs-magit-org-todos-el emacs-magit-org-todos
-  (deprecated-package "emacs-magit-org-todos-el" emacs-magit-org-todos))
+(define-deprecated-package emacs-magit-org-todos-el
+  emacs-magit-org-todos)
 
 (define-public emacs-vcsh
   (package


@@ 29823,8 29823,8 @@ Magit.")
 @end itemize\n")
     (license license:gpl3+)))
 
-(define-deprecated/public emacs-lice-el emacs-lice
-  (deprecated-package "emacs-lice-el" emacs-lice))
+(define-deprecated-package emacs-lice-el
+  emacs-lice)
 
 (define-public emacs-academic-phrases
   (let ((commit "0823ed8c24b26c32f909b896a469833ec4d7b656"))


@@ 32904,8 32904,8 @@ In addition to its predecessor, it offers the following features:
 combinations to perform Cargo tasks within Rust projects.")
       (license license:gpl3+))))
 
-(define-deprecated/public emacs-cargo-el emacs-cargo
-  (deprecated-package "emacs-cargo-el" emacs-cargo))
+(define-deprecated-package emacs-cargo-el
+  emacs-cargo)
 
 (define-public emacs-ztree
   ;; Upstream provides no tag, but the commit below matches latest release.


@@ 35010,8 35010,8 @@ It provides integration with multiple built-in modes, as well as providing an
 interface to attach and interact with the processes.")
     (license license:gpl3+)))
 
-(define-public emacs-dtache
-  (deprecated-package "emacs-dtache" emacs-detached))
+(define-deprecated-package emacs-dtache
+  emacs-detached)
 
 (define-public emacs-dtrt-indent
   (package


@@ 36397,8 36397,8 @@ subsequent committal of a chain of @code{undo} commands as a single edit in
 the @code{undo} history.")
       (license license:gpl3+))))
 
-(define-deprecated/public emacs-undo-propose-el emacs-undo-propose
-  (deprecated-package "emacs-undo-propose-el" emacs-undo-propose))
+(define-deprecated-package emacs-undo-propose-el
+  emacs-undo-propose)
 
 (define-public emacs-elisp-docstring-mode
   (let ((commit "f512e509dd690f65133e55563ebbfd2dede5034f")


@@ 36543,8 36543,8 @@ buffers.")
 JavaScript.")
     (license license:gpl3+)))
 
-(define-deprecated/public emacs-js2-refactor-el emacs-js2-refactor
-  (deprecated-package "emacs-js2-refactor-el" emacs-js2-refactor))
+(define-deprecated-package emacs-js2-refactor-el
+  emacs-js2-refactor)
 
 (define-public emacs-jsdoc
   (package


@@ 36692,8 36692,8 @@ done using Helm, Ido or Ivy.")
 Lisp functions that call themselves in tail position.")
       (license license:gpl3+))))
 
-(define-deprecated/public emacs-tco-el emacs-tco
-  (deprecated-package "emacs-tco-el" emacs-tco))
+(define-deprecated-package emacs-tco-el
+  emacs-tco)
 
 (define-public emacs-equake
   ;; Upstream provides no tagged releases, but the commit below matches an


@@ 37016,8 37016,8 @@ screensaver activation in EXWM.")
     (description "This package provides a GUI for defining and monitoring services.")
     (license license:gpl3+)))
 
-(define-public emacs-prodigy-el
-  (deprecated-package "emacs-prodigy-el" emacs-prodigy))
+(define-deprecated-package emacs-prodigy-el
+  emacs-prodigy)
 
 (define-public emacs-web-server
   (package


@@ 37206,8 37206,8 @@ support JSX syntax.")
 expanding regions of text without modifying the actual contents.")
       (license license:expat))))
 
-(define-deprecated/public emacs-origami-el emacs-origami
-  (deprecated-package "emacs-origami-el" emacs-origami))
+(define-deprecated-package emacs-origami-el
+  emacs-origami)
 
 (define-public emacs-peep-dired
   (let ((commit "c88a9a3050197840edfe145f11e0bb9488de32f4")


@@ 37597,16 37597,16 @@ all of your projects, then override or add variables on a per-project basis.")
 user interfaces for various built-in modes.")
     (license license:gpl3+)))
 
-(define-public emacs-casual-calc
-  (deprecated-package "emacs-casual-calc" emacs-casual))
-(define-public emacs-casual-dired
-  (deprecated-package "emacs-casual-dired" emacs-casual))
-(define-public emacs-casual-info
-  (deprecated-package "emacs-casual-info" emacs-casual))
-(define-public emacs-casual-lib
-  (deprecated-package "emacs-casual-lib" emacs-casual))
-(define-public emacs-casual-avy
-  (deprecated-package "emacs-casual-avy" emacs-casual))
+(define-deprecated-package emacs-casual-calc
+  emacs-casual)
+(define-deprecated-package emacs-casual-dired
+  emacs-casual)
+(define-deprecated-package emacs-casual-info
+  emacs-casual)
+(define-deprecated-package emacs-casual-lib
+  emacs-casual)
+(define-deprecated-package emacs-casual-avy
+  emacs-casual)
 
 (define-public emacs-calibredb
   (package


@@ 37883,8 37883,8 @@ needing to write the result into the buffer.")
 well as an option for visually flashing evaluated s-expressions.")
     (license license:gpl3+)))
 
-(define-deprecated/public emacs-eval-sexp-fu-el emacs-eval-sexp-fu
-  (deprecated-package "emacs-eval-sexp-fu-el" emacs-eval-sexp-fu))
+(define-deprecated-package emacs-eval-sexp-fu-el
+  emacs-eval-sexp-fu)
 
 (define-public emacs-counsel-tramp
   (package


@@ 38165,8 38165,8 @@ functions (e.g. @code{webfeeder-title-function}).")
 end of a line and increment or decrement it.")
       (license license:gpl3+))))
 
-(define-public emacs-janpath-evil-numbers
-  (deprecated-package "emacs-janpath-evil-numbers" emacs-evil-numbers))
+(define-deprecated-package emacs-janpath-evil-numbers
+  emacs-evil-numbers)
 
 (define-public emacs-rotate-text
   (package


@@ 43570,8 43570,8 @@ supports Japanese and has the following features:
 @end itemize\n")
     (license license:gpl2+)))
 
-(define-deprecated/public emacs-spamfilter-el emacs-spamfilter
-  (deprecated-package "emacs-spamfilter-el" emacs-spamfilter))
+(define-deprecated-package emacs-spamfilter-el
+  emacs-spamfilter)
 
 (define-public emacs-promise
   ;; XXX: Last stable release fails to build with "(wrong-number-of-arguments


@@ 44737,8 44737,8 @@ with the ed editor.")
 audio volume via amixer.")
     (license license:gpl3+)))
 
-(define-deprecated/public emacs-alsamixer-el emacs-alsamixer
-  (deprecated-package "emacs-alsamixer-el" emacs-alsamixer))
+(define-deprecated-package emacs-alsamixer-el
+  emacs-alsamixer)
 
 (define-public emacs-fennel-mode
   (package


@@ 44935,8 44935,8 @@ on the chosen style."))))
 hacker.")
       (license license:expat))))
 
-(define-deprecated/public emacs-straight-el emacs-straight
-  (deprecated-package "emacs-straight-el" emacs-straight))
+(define-deprecated-package emacs-straight-el
+  emacs-straight)
 
 (define-public emacs-osm
   (package

@@ 711,8 711,8 @@ editor (with wide ints)" )
 (define-public emacs-next (emacs->emacs-next emacs))
 (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk))
 (define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
-(define-public emacs-next-tree-sitter
-  (deprecated-package "emacs-next-tree-sitter" emacs-next))
+(define-deprecated-package emacs-next-tree-sitter
+  emacs-next)
 
 (define-public guile-emacs
   (let ((upstream-version "31.0.50")

@@ 2078,8 2078,8 @@ metadata about each known libretro core.  The snapshot is taken from the
 @url{https://github.com/libretro/libretro-super, libretro-super} repository.")
     (license license:expat)))
 
-(define-public retroarch-core-info
-  (deprecated-package "retroarch-core-info" libretro-core-info))
+(define-deprecated-package retroarch-core-info
+  libretro-core-info)
 
 (define-public libretro-database
   (package

@@ 3818,10 3818,10 @@ executables, shared libraries and core dumps.  It supports many architectures
 and extensions.")
     (license license:gpl3+)))
 
-(define-public emacs-poke
-  ;; The 'emacs-poke' name may eventually refer to 'poke' from ELPA, which is
-  ;; a different beast.
-  (deprecated-package "emacs-poke" poke))
+;; The 'emacs-poke' name may eventually refer to 'poke' from ELPA, which is
+;; a different beast.
+(define-deprecated-package emacs-poke
+  poke)
 
 (define-public pcb2gcode
   ;; XXX: The latest release was on <2022-09-12>, but master branch contains a

@@ 218,8 218,8 @@ native interface that allows you to integrate Mastodon's social experience
 seamlessly with your desktop environment.")
     (license license:gpl3)))
 
-(define-public tootle
-  (deprecated-package "tootle" tuba))
+(define-deprecated-package tootle
+  tuba)
 
 (define-public python-mastodon-py
   (package

@@ 1253,8 1253,8 @@ Virtual Machines.  OVMF contains a sample UEFI firmware for QEMU and KVM.")
                       (install-file "RISCV_VIRT_CODE.fd" fmw)
                       (install-file "RISCV_VIRT_VARS.fd" fmw))))))))))))
 
-(define-public ovmf
-  (deprecated-package "ovmf" ovmf-x86-64))
+(define-deprecated-package ovmf
+  ovmf-x86-64)
 
 (define* (make-arm-trusted-firmware platform #:key
                                     (triplet "aarch64-linux-gnu")

@@ 1991,8 1991,8 @@ well in user interface (UI) environments.")
     (license license:silofl1.1)))
 
 ;; https://github.com/adobe-fonts/source-sans/issues/192
-(define-public font-adobe-source-sans-pro
-  (deprecated-package "font-adobe-source-sans-pro"  font-adobe-source-sans))
+(define-deprecated-package font-adobe-source-sans-pro
+  font-adobe-source-sans)
 
 (define-public font-adobe-source-serif
   (package


@@ 2018,8 2018,8 @@ family.")
     (license license:silofl1.1)))
 
 ;; https://github.com/adobe-fonts/source-serif/issues/77
-(define-public font-adobe-source-serif-pro
-  (deprecated-package "font-adobe-source-serif-pro" font-adobe-source-serif))
+(define-deprecated-package font-adobe-source-serif-pro
+  font-adobe-source-serif)
 
 (define-public font-microsoft-cascadia
   (package


@@ 2929,8 2929,8 @@ characters mostly intact.")
   constraint of usability at small point sizes.")
     (license (list license:silofl1.1))))
 
-(define-public font-iosevka-comfy
-  (deprecated-package "font-iosevka-comfy"  font-aporetic))
+(define-deprecated-package font-iosevka-comfy
+  font-aporetic)
 
 (define-public font-junicode
   (package


@@ 3653,8 3653,8 @@ and legible typeface suitable for web pages and applications.")
     (license license:silofl1.1)))
 
 ;; https://github.com/rastikerdar/vazirmatn/blob/master/CHANGELOG.md#3200
-(define-public font-vazir
-  (deprecated-package "font-vazir" font-vazirmatn))
+(define-deprecated-package font-vazir
+  font-vazirmatn)
 
 (define-public font-victor-mono
   (package

@@ 1184,8 1184,8 @@ stroke fonts with C++11/Qt.")
     ;; Dual-licensed, either license applies.
     (license (list license:asl2.0 license:expat))))
 
-(define-public fontobene-qt5
-  (deprecated-package "fontobene-qt5" fontobene-qt))
+(define-deprecated-package fontobene-qt5
+  fontobene-qt)
 
 (define-public ttfautohint
   (package

@@ 11371,8 11371,8 @@ across many levels and collect all the coaches to win.")
     ;; license.  Desktop file is licensed under CC0 terms.
     (license (list license:gpl2 license:gpl3 license:cc0))))
 
-(define-public ri-li
-  (deprecated-package "ri-li" li-ri))
+(define-deprecated-package ri-li
+  li-ri)
 
 (define-public freeorion
   (package

@@ 408,8 408,8 @@ Ghostscript.  It currently includes the 35 standard PostScript fonts.")
    (license license:gpl2)
    (home-page "https://sourceforge.net/projects/gs-fonts/")))
 
-(define-public gs-fonts
-  (deprecated-package "gs-fonts" font-ghostscript))
+(define-deprecated-package gs-fonts
+  font-ghostscript)
 
 (define-public libspectre
   (package

@@ 504,8 504,8 @@ that is extensible via a plugin system.")
                               shared-mime-info)))))
 
 (define-public gimp gimp-3)
-(define-public gimp-next
-  (deprecated-package "gimp-next" gimp-3))
+(define-deprecated-package gimp-next
+  gimp-3)
 
 (define-public gimp-fourier
   (package

@@ 686,8 686,8 @@ from software emulation to complete hardware acceleration for modern GPUs.")
 
 ;;; ICD was part of the Gallium (Clover) OpenCL driver, which was replaced
 ;;; with Rusticl.
-(define-public mesa-opencl-icd
-  (deprecated-package "mesa-opencl-icd" mesa-opencl))
+(define-deprecated-package mesa-opencl-icd
+  mesa-opencl)
 
 (define-public mesa-headers
   (package/inherit mesa

@@ 1221,9 1221,8 @@ copies you now want to paste.")
 shell, including panels, corners, workspaces.")
     (license license:gpl3)))
 
-(define-public gnome-shell-extension-vertical-overview
-  (deprecated-package "gnome-shell-extension-vertical-overview"
-                      gnome-shell-extension-v-shell))
+(define-deprecated-package gnome-shell-extension-vertical-overview
+  gnome-shell-extension-v-shell)
 
 (define-public gnome-shell-extension-burn-my-windows
   (package

@@ 2967,8 2967,8 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
     (description "Icons for the GNOME desktop.")
     (license license:lgpl3))) ; or Creative Commons BY-SA 3.0
 
-(define-public gnome-icon-theme
-  (deprecated-package "gnome-icon-theme" adwaita-icon-theme))
+(define-deprecated-package gnome-icon-theme
+  adwaita-icon-theme)
 
 (define-public tango-icon-theme
   (package


@@ 7406,8 7406,8 @@ programs via D-Bus.  It also ships a library for integration into development
 environments.")
     (license license:gpl2+)))
 
-(define-public d-feet
-  (deprecated-package "d-feet" d-spy))
+(define-deprecated-package d-feet
+  d-spy)
 
 (define-public yelp-xsl
   (package


@@ 10617,8 10617,8 @@ Aegis (encrypted / plain-text), andOTP, Google Authenticator
 @end itemize")
     (license license:gpl3+)))
 
-(define-public authenticator
-  (deprecated-package "authenticator" gnome-authenticator))
+(define-deprecated-package authenticator
+  gnome-authenticator)
 
 (define-public gsound
   (package


@@ 11909,8 11909,8 @@ format.  It integrates perfectly with the GNOME desktop and provides an easy
 and uncluttered interface for the management of password databases.")
     (license license:gpl3+)))
 
-(define-public passwordsafe
-  (deprecated-package "passwordsafe" secrets))
+(define-deprecated-package passwordsafe
+  secrets)
 
 (define-public sound-juicer
   (package


@@ 12673,8 12673,8 @@ versions of Adwaita, Adwaita-dark and HighContrast themes.  It also provides
 index files needed for Adwaita to be used outside of GNOME.")
     (license license:lgpl2.1+)))
 
-(define-public gnome-themes-standard
-  (deprecated-package "gnome-themes-standard" gnome-themes-extra))
+(define-deprecated-package gnome-themes-standard
+  gnome-themes-extra)
 
 (define-public gnote
   (package

@@ 3165,8 3165,8 @@ Go.")
                     "\nThis package provides a command line interface (CLI)
 tools."))))
 
-(define-public age-keygen
-  (deprecated-package "age-keygen" age))
+(define-deprecated-package age-keygen
+  age)
 
 (define-public go-imohash
   (package/inherit go-github-com-kalafut-imohash

@@ 14136,12 14136,10 @@ protocol.")
 and concepts from Philipp Winter's ScrambleSuit protocol.")
     (license (list license:bsd-2 license:bsd-3))))
 
-(define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
-  ;; This is a final command, no need for a full name of the go.mod module path
-  ;; style. The same is suggested in project's README and Makefile.
-  (deprecated-package
-   "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird"
-   lyrebird))
+;; This is a final command, no need for a full name of the go.mod module path
+;; style. The same is suggested in project's README and Makefile.
+(define-deprecated-package go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
+  lyrebird)
 
 (define-public go-jose-util
   (package

@@ 8354,8 8354,8 @@ while callers can implement logging with whatever backend is appropriate.")
 standard log package.")
     (license license:asl2.0)))
 
-(define-public go-github-com-go-md2man
-  (deprecated-package "go-github-com-go-md2man" go-github-com-cpuguy83-go-md2man-v2))
+(define-deprecated-package go-github-com-go-md2man
+  go-github-com-cpuguy83-go-md2man-v2)
 
 (define-public go-github-com-go-openapi-inflect
   (package

@@ 434,8 434,8 @@ millions of nodes (as long as they can fit in memory).  The core function is
 algorithm for a number of different methods.")
     (license license:gpl3+)))
 
-(define-public python-vtraag-louvain
-  (deprecated-package "python-vtraag-louvain" python-louvain-igraph))
+(define-deprecated-package python-vtraag-louvain
+  python-louvain-igraph)
 
 (define-public python-pygsp
   (package

@@ 896,11 896,11 @@ is part of the GNOME accessibility project.")
     (properties (alist-delete 'hidden?
                               (package-properties at-spi2-core)))))
 
-(define-public at-spi2-atk
-  (deprecated-package "at-spi2-atk" at-spi2-core))
+(define-deprecated-package at-spi2-atk
+  at-spi2-core)
 
-(define-public atk
-  (deprecated-package "atk" at-spi2-core))
+(define-deprecated-package atk
+  at-spi2-core)
 
 (define-public gtk+-2
   (package

@@ 902,9 902,9 @@ manipulate repositories of the Git version control system.")
 (define-public guile2.2-git
   (package-for-guile-2.2 guile-git))
 
-(define-public guile2.0-git
-  ;; Guile-Git 0.8.0 no longer supports Guile 2.0.
-  (deprecated-package "guile2.0-git" guile2.2-git))
+;; Guile-Git 0.8.0 no longer supports Guile 2.0.
+(define-deprecated-package guile2.0-git
+  guile2.2-git)
 
 (define-public guile-zlib
   (package

@@ 304,8 304,8 @@ sharing.")
     (license license:gpl2)))
 
 ;; Added on 2025-09-24.
-(define-public barrier
-  (deprecated-package "barrier" deskflow))
+(define-deprecated-package barrier
+  deskflow)
 
 (define-public hw-probe
   (package

@@ 920,8 920,8 @@ configuration.  This library provides the common bits for writing custom
     (license license:bsd-3)))
 
 ;; Deprecated. Don’t use.
-(define-public ghc-cabal-doctest
-  (deprecated-package "ghc-cabal-doctest" cabal-doctest))
+(define-deprecated-package ghc-cabal-doctest
+  cabal-doctest)
 
 (define-public ghc-testing-type-modifiers
   (package

@@ 1318,8 1318,8 @@ workspaces.
 @end itemize")
     (license license:gpl3+)))
 
-(define-public python-ueberzug
-  (deprecated-package "python-ueberzug" ueberzug))
+(define-deprecated-package python-ueberzug
+  ueberzug)
 
 (define-public vv
   (package

@@ 2578,8 2578,8 @@ interface as simple as the HTTP web, but with permanence built in.  You can
 also mount the world at @code{/ipfs}.")
     (license license:expat)))
 
-(define-public go-ipfs
-  (deprecated-package "go-ipfs" kubo))
+(define-deprecated-package go-ipfs
+  kubo)
 
 (define-public spritely-libp2p-daemon
   (let ((version "0.1")

@@ 2295,8 2295,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
                       `(("CONFIG_OVERLAY_FS" . m))
                       (default-extra-linux-options linux-libre-version))))
 
-(define-public linux-libre-with-bpf
-  (deprecated-package "linux-libre-with-bpf" linux-libre))
+(define-deprecated-package linux-libre-with-bpf
+  linux-libre)
 
 
 ;;;


@@ 12177,8 12177,8 @@ suggestions from various sources, including:
 This tool supports checking Kconfig options and kernel cmdline parameters.")
     (license license:gpl3)))
 
-(define-public kconfig-hardened-check
-  (deprecated-package "kconfig-hardened-check" kernel-hardening-checker))
+(define-deprecated-package kconfig-hardened-check
+  kernel-hardening-checker)
 
 (define-public firejail
   (package

@@ 213,8 213,8 @@ new features.")
       (license license:lgpl2.1+))))
 
 ;; This package is deprecated. "Minetest Game" is no longer the official game.
-(define-public minetest-data
-  (deprecated-package "minetest-data" minetest-game))
+(define-deprecated-package minetest-data
+  minetest-game)
 
 (define-public (luanti-topic topic-id)
   "Return an URL (as a string) pointing to the forum topic with


@@ 482,8 482,8 @@ Minecraft, pushing beyond.")
     (home-page "https://content.luanti.org/packages/Wuzzy/mineclone2/")
     (license license:gpl3+)))
 
-(define-public luanti-mineclone
-  (deprecated-package "luanti-mineclone" luanti-voxelibre))
+(define-deprecated-package luanti-mineclone
+  luanti-voxelibre)
 
 (define-public luanti-mobs
   (package

@@ 1703,11 1703,11 @@ an extensible computation graph model, as well as definitions of built-in
 operators and standard data types.")
     (license license:expat)))
 
-(define-public python-onnx
-  ;; This used to be called "python-onnx" because it provided nothing but
-  ;; Python bindings.  The package now provides shared libraries and C++
-  ;; headers, hence the name change.
-  (deprecated-package "python-onnx" onnx))
+;; This used to be called "python-onnx" because it provided nothing but
+;; Python bindings.  The package now provides shared libraries and C++
+;; headers, hence the name change.
+(define-deprecated-package python-onnx
+  onnx)
 
 (define-public onnx-optimizer
   (package

@@ 579,8 579,8 @@ compatible with the configuration of
 Python}.")
     (license license:gpl3+)))
 
-(define-public go-gitlab.com-shackra-goimapnotify
-  (deprecated-package "go-gitlab.com-shackra-goimapnotify" goimapnotify))
+(define-deprecated-package go-gitlab.com-shackra-goimapnotify
+  goimapnotify)
 
 (define-public guile2.2-mailutils
   (package


@@ 1277,8 1277,8 @@ can read the same mailbox from multiple computers.  It supports IMAP as REMOTE
 repository and Maildir/IMAP as LOCAL repository.")
       (license license:gpl2+))))
 
-(define-public offlineimap
-  (deprecated-package "offlineimap" offlineimap3))
+(define-deprecated-package offlineimap
+  offlineimap3)
 
 (define-public emacs-mew
   (let ((commit "35772ee0b44dd7e56b0f3899b27fa545b2bc6f03")


@@ 1845,8 1845,8 @@ features.  This is a fork derived from getmail 5.14, aimed at Python 3
 compatibility.")
     (license license:gpl2+)))           ;see docs/COPYING
 
-(define-public getmail
-  (deprecated-package "getmail" getmail6))
+(define-deprecated-package getmail
+  getmail6)
 
 (define-public libetpan
   (package

@@ 2185,8 2185,8 @@ extremely large and complex data collections.")
 Interface to wrap the HDF5 library, which is implemented in C.")
     (license (package-license hdf5))))
 
-(define-public hdf-java
-  (deprecated-package "hdf-java" hdf5-java))
+(define-deprecated-package hdf-java
+  hdf5-java)
 
 (define-public hdf-eos2
   (package

@@ 1321,8 1321,8 @@ and OpenPGP) and available in 29 languages.")
     (home-page "https://gajim.org/")
     (license license:gpl3)))
 
-(define-public gajim-omemo
-  (deprecated-package "gajim-omemo" gajim))
+(define-deprecated-package gajim-omemo
+  gajim)
 
 (define-public gajim-openpgp
   (package


@@ 3078,8 3078,8 @@ social and chat platform.")
 designed for experienced users.")
     (license license:gpl2+)))
 
-(define-public psi
-  (deprecated-package "psi" psi-plus))
+(define-deprecated-package psi
+  psi-plus)
 
 (define-public python-zulip
   (package

@@ 29,74 29,74 @@
   #:use-module (guix packages)
   #:use-module (gnu packages luanti))
 
-(define-public minetest
-  (deprecated-package "minetest" luanti))
+(define-deprecated-package minetest
+  luanti)
 
-(define-public minetest-server
-  (deprecated-package "minetest-server" luanti-server))
+(define-deprecated-package minetest-server
+  luanti-server)
 
-(define-public minetest-moreores
-  (deprecated-package "minetest-moreores" luanti-moreores))
+(define-deprecated-package minetest-moreores
+  luanti-moreores)
 
-(define-public minetest-sound-api-core
-  (deprecated-package "minetest-sound-api-core" luanti-sound-api-core))
+(define-deprecated-package minetest-sound-api-core
+  luanti-sound-api-core)
 
-(define-public minetest-basic-materials
-  (deprecated-package "minetest-basic-materials" luanti-basic-materials))
+(define-deprecated-package minetest-basic-materials
+  luanti-basic-materials)
 
-(define-public minetest-coloredwood
-  (deprecated-package "minetest-coloredwood" luanti-coloredwood))
+(define-deprecated-package minetest-coloredwood
+  luanti-coloredwood)
 
-(define-public minetest-ethereal
-  (deprecated-package "minetest-ethereal" luanti-ethereal))
+(define-deprecated-package minetest-ethereal
+  luanti-ethereal)
 
-(define-public minetest-homedecor-modpack
-  (deprecated-package "minetest-homedecor-modpack" luanti-homedecor-modpack))
+(define-deprecated-package minetest-homedecor-modpack
+  luanti-homedecor-modpack)
 
-(define-public minetest-mesecons
-  (deprecated-package "minetest-mesecons" luanti-mesecons))
+(define-deprecated-package minetest-mesecons
+  luanti-mesecons)
 
-(define-public minetest-mineclone
-  (deprecated-package "minetest-mineclone" luanti-voxelibre))
+(define-deprecated-package minetest-mineclone
+  luanti-voxelibre)
 
-(define-public minetest-mobs
-  (deprecated-package "minetest-mobs" luanti-mobs))
+(define-deprecated-package minetest-mobs
+  luanti-mobs)
 
-(define-public minetest-mobs-animal
-  (deprecated-package "minetest-mobs-animal" luanti-mobs-animal))
+(define-deprecated-package minetest-mobs-animal
+  luanti-mobs-animal)
 
-(define-public minetest-mobs-monster
-  (deprecated-package "minetest-mobs-monster" luanti-mobs-monster))
+(define-deprecated-package minetest-mobs-monster
+  luanti-mobs-monster)
 
-(define-public minetest-pipeworks
-  (deprecated-package "minetest-pipeworks" luanti-pipeworks))
+(define-deprecated-package minetest-pipeworks
+  luanti-pipeworks)
 
-(define-public minetest-technic
-  (deprecated-package "minetest-technic" luanti-technic))
+(define-deprecated-package minetest-technic
+  luanti-technic)
 
-(define-public minetest-throwing
-  (deprecated-package "minetest-throwing" luanti-throwing))
+(define-deprecated-package minetest-throwing
+  luanti-throwing)
 
-(define-public minetest-throwing-arrows
-  (deprecated-package "minetest-throwing-arrows" luanti-throwing-arrows))
+(define-deprecated-package minetest-throwing-arrows
+  luanti-throwing-arrows)
 
-(define-public minetest-worldedit
-  (deprecated-package "minetest-worldedit" luanti-worldedit))
+(define-deprecated-package minetest-worldedit
+  luanti-worldedit)
 
-(define-public minetest-unifieddyes
-  (deprecated-package "minetest-unifieddyes" luanti-unifieddyes))
+(define-deprecated-package minetest-unifieddyes
+  luanti-unifieddyes)
 
-(define-public minetest-unified-inventory
-  (deprecated-package "minetest-unified-inventory" luanti-unified-inventory))
+(define-deprecated-package minetest-unified-inventory
+  luanti-unified-inventory)
 
-(define-public minetest-advtrains
-  (deprecated-package "minetest-advtrains" luanti-advtrains))
+(define-deprecated-package minetest-advtrains
+  luanti-advtrains)
 
-(define-public minetest-basic-trains
-  (deprecated-package "minetest-basic-trains" luanti-basic-trains))
+(define-deprecated-package minetest-basic-trains
+  luanti-basic-trains)
 
-(define-public minetest-oneblock
-  (deprecated-package "minetest-oneblock" luanti-oneblock))
+(define-deprecated-package minetest-oneblock
+  luanti-oneblock)
 
-(define-public minetest-wielded-light
-  (deprecated-package "minetest-wielded-light" luanti-wielded-light))
+(define-deprecated-package minetest-wielded-light
+  luanti-wielded-light)

@@ 603,9 603,8 @@ WSGI and the node exporter textfile collector.")
 written in Go with pluggable metric collectors.")
     (license license:asl2.0)))
 
-(define-public go-github-com-prometheus-node-exporter
-  (deprecated-package "go-github-com-prometheus-node-exporter"
-                      prometheus-node-exporter))
+(define-deprecated-package go-github-com-prometheus-node-exporter
+  prometheus-node-exporter)
 
 (define-public prometheus-postgres-exporter
   (package

@@ 4358,8 4358,8 @@ using the beets FetchArt plugin.")
 ;;; XXX: The original project is abandoned for 4y, see
 ;;; <https://github.com/unrblt/beets-bandcamp/issues/15>, this package may be
 ;;; sourced from maintained fork <https://github.com/snejus/beetcamp>.
-(define-public beets-bandcamp
-  (deprecated-package "beets-bandcamp" beets-beetcamp))
+(define-deprecated-package beets-bandcamp
+  beets-beetcamp)
 
 (define-public milkytracker
   (package

@@ 89,5 89,5 @@ ncurses installed.")
     (native-inputs (list pkg-config))
     (properties `((tunable? . #t)))))
 
-(define-public ncdu-2
-  (deprecated-package "ncdu2" ncdu))
+(define-deprecated-package ncdu-2
+  ncdu)

@@ 2077,8 2077,8 @@ manage, and delete Internet resources from Gandi.net such as domain names,
 virtual machines, and certificates.")
     (license license:gpl3+)))
 
-(define-public gandi.cli
-  (deprecated-package "gandi.cli" gandi-cli))
+(define-deprecated-package gandi.cli
+  gandi-cli)
 
 (define-public go-sctp
   ;; docker-libnetwork-cmd-proxy requires this exact commit.

@@ 309,8 309,8 @@ of performance metrics for parallel programs including MPI and OpenMP
 applications.  CubeGUI is the graphical explorer of the CUBE project.")))
 
 ;; deprecated on 2025-09-22
-(define-public cube
-  (deprecated-package "cube" cubegui))
+(define-deprecated-package cube
+  cubegui)
 
 (define-public tracy-wayland
   (package

@@ 328,5 328,5 @@ Python code natively, including C extensions.")
      (modify-inputs (package-inputs pypy2)
        (append xz)))))
 
-(define-public pypy3
-  (deprecated-package "pypy3" pypy))
+(define-deprecated-package pypy3
+  pypy)

@@ 188,8 188,8 @@ to access its data, so it can be used as a drop-in replacement.")
 package, an implementation of the Brotli lossless compression algorithm.")
     (license license:expat)))
 
-(define-public python-google-brotli
-  (deprecated-package "python-google-brotli" python-brotli))
+(define-deprecated-package python-google-brotli
+  python-brotli)
 
 (define-public python-multivolumefile
   (package


@@ 792,8 792,8 @@ for improving compression, as well as a python/C package that implements this
 algorithm within the Numpy framework.")
     (license license:expat)))
 
-(define-public bitshuffle
-  (deprecated-package "bitshuffle" python-bitshuffle))
+(define-deprecated-package bitshuffle
+  python-bitshuffle)
 
 (define-public bitshuffle-for-snappy
   (package/inherit python-bitshuffle

@@ 4846,8 4846,8 @@ WebSockets (over HTTP/1 and HTTP/2), ASGI/2, and ASGI/3 specifications.  It
 can utilise asyncio, uvloop, or trio worker types.")
     (license license:expat)))
 
-(define-public python-hypercorn
-  (deprecated-package "python-hypercorn" hypercorn))
+(define-deprecated-package python-hypercorn
+  hypercorn)
 
 (define-public python-querystring-parser
   (package


@@ 6165,8 6165,8 @@ python-requests.")
 HTTP via a UNIX domain socket.")
     (license license:asl2.0)))
 
-(define-public python-requests-unixsocket
-  (deprecated-package "python-requests-unixsocket" python-requests-unixsocket2))
+(define-deprecated-package python-requests-unixsocket
+  python-requests-unixsocket2)
 
 (define-public python-requests-ntlm
   (package


@@ 10036,8 10036,8 @@ decorators and tools to describe your API and expose its documentation properly 
 Swagger.")
     (license license:bsd-3)))
 
-(define-public python-flask-restplus
-  (deprecated-package "python-flask-restplus" python-flask-restx))
+(define-deprecated-package python-flask-restplus
+  python-flask-restx)
 
 (define-public python-flask-socketio
   (package

@@ 1,6 1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2013-2024 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2023 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2017, 2021, 2022, 2024 Eric Bavier <bavier@posteo.net>


@@ 4656,8 4656,8 @@ which is a fork of @url{http://hdfeos.org/software/pyhdf.php,pyhdf}.")
 ;; Version 0.9.x was called python-hdf4 in PyPI because at that time upstream
 ;; didn't have access to the pyhdf package in PyPI. For version 0.10.0 and
 ;; onward, please install pyhdf instead of python-hdf4.
-(define-public python-hdf4
-  (deprecated-package "python-hdf4" python-pyhdf))
+(define-deprecated-package python-hdf4
+  python-pyhdf)
 
 (define-public python-h5netcdf
   (package


@@ 9789,8 9789,8 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.")
      "This package provides a JSON RPC 2.0 server library for Python.")
     (license license:expat)))
 
-(define-public python-jsonrpc-server
-  (deprecated-package "python-jsonrpc-server" python-lsp-jsonrpc))
+(define-deprecated-package python-jsonrpc-server
+  python-lsp-jsonrpc)
 
 (define-public python-pydantic
   (package


@@ 10129,8 10129,8 @@ This tool is used in text editing environments to provide a complete
 and integrated feature-set for programming Python effectively.")
     (license license:expat)))
 
-(define-public python-language-server
-  (deprecated-package "python-language-server" python-lsp-server))
+(define-deprecated-package python-language-server
+  python-lsp-server)
 
 (define-public python-black
   (package


@@ 16356,8 16356,8 @@ file (e.g. @file{PKG-INFO}).")
     (license license:expat)))
 
 ;; pep621 was renamed to pyproject-metadata.
-(define-public python-pep621
-  (deprecated-package "python-pep621" python-pyproject-metadata))
+(define-deprecated-package python-pep621
+  python-pyproject-metadata)
 
 (define-public python-meson-python
   (package


@@ 18333,8 18333,8 @@ invoked on those path objects directly.")
                               (package-properties
                                python-path-bootstrap)))))
 
-(define-public python-pathpy
-  (deprecated-package "python-pathpy" python-path))
+(define-deprecated-package python-pathpy
+  python-path)
 
 (define-public python-pretend
   (package


@@ 24210,8 24210,8 @@ pytest-fixtures-style dependency injection.")
      extracting firmware images")
     (license license:expat)))
 
-(define-public python-binwalk
-  (deprecated-package "python-binwalk" binwalk))
+(define-deprecated-package python-binwalk
+  binwalk)
 
 (define-public python-bson
   (package


@@ 35949,8 35949,8 @@ all the niceties of modern GUI-based debuggers in a more lightweight and
 keyboard-friendly package.")
     (license license:expat)))
 
-(define-public pudb
-  (deprecated-package "pudb" python-pudb))
+(define-deprecated-package pudb
+  python-pudb)
 
 (define-public python-iwlib
   (package

@@ 6166,8 6166,8 @@ services using the XML based SOAP protocol and without the need for a dedicated
 web server.")
       (license (list license:gpl2 license:gpl3)))))
 
-(define-public kdsoap-qt6
-  (deprecated-package "kdsoap-qt6" kdsoap))
+(define-deprecated-package kdsoap-qt6
+  kdsoap)
 
 (define-public libaccounts-qt
   (package

@@ 7726,8 7726,8 @@ documents and fragments.  It's built on top of Nokogiri and libxml2.")
     (license license:expat)))
 
 ;;; The ruby-nokogumbo package has been absorbed into ruby-nokogiri.
-(define-public ruby-nokogumbo
-  (deprecated-package "ruby-nokogumbo" ruby-nokogiri))
+(define-deprecated-package ruby-nokogumbo
+  ruby-nokogiri)
 
 (define-public ruby-samovar
   (package


@@ 12037,8 12037,8 @@ patterns.")
 ;;; The 'gem' is called 'concurrent-ruby'; reversing its name was confusing
 ;;; and failed to be picked by the gem importer (which led to this newer
 ;;; package).
-(define-public ruby-concurrent
-  (deprecated-package "ruby-concurrent" ruby-concurrent-ruby))
+(define-deprecated-package ruby-concurrent
+  ruby-concurrent-ruby)
 
 (define-public ruby-concurrent-ruby-ext
   (package

@@ 1021,8 1021,8 @@ metadata.  It also knows about symlinks, extended attributes, and Git.
 This package is the community maintained fork of @code{exa}.")
     (license license:eupl1.2)))
 
-(define-public exa
-  (deprecated-package "exa" eza))
+(define-deprecated-package exa
+  eza)
 
 (define-public fclones
   (package


@@ 4008,8 4008,8 @@ and users are in full control of their data and workflow.")
      (substitute-keyword-arguments (package-arguments rust-xremap)
        ((#:features _) '(list "hyprland"))))))
 
-(define-public xremap-sway
-  (deprecated-package "xremap-sway" xremap-wlroots))
+(define-deprecated-package xremap-sway
+  xremap-wlroots)
 
 (define-public xremap-x11
   (package

@@ 211,8 211,8 @@ serialization.")))
 
 ;;; The msgpack package was split into msgpack-c and msgpack-cxx starting from
 ;;; version 4.0.0.
-(define-public msgpack
-  (deprecated-package "msgpack" msgpack-c))
+(define-deprecated-package msgpack
+  msgpack-c)
 
 (define-public msgpack-3
   (package

@@ 1033,10 1033,10 @@ scripts and YSH is a legacy-free shell, with structured data for Python and
 JavaScript users who avoid shell.")
     (license (list license:asl2.0))))
 
-(define-public oil
-  ;; Since release 0.16.0 the former Oil project has been renamed to Oils:
-  ;; <https://www.oilshell.org/blog/2023/03/rename.html>.
-  (deprecated-package "oil" oils))
+;; Since release 0.16.0 the former Oil project has been renamed to Oils:
+;; <https://www.oilshell.org/blog/2023/03/rename.html>.
+(define-deprecated-package oil
+  oils)
 
 (define-public gash
   (package

@@ 99,5 99,5 @@ for CPUs and GPUs from all vendors, with independent, community-driven
 compiler for C++-based heterogeneous programming models")
     (license license:bsd-2)))
 
-(define-public opensycl
-  (deprecated-package "opensycl" adaptivecpp))
+(define-deprecated-package opensycl
+  adaptivecpp)

@@ 224,8 224,8 @@ notification area icon for Syncthing.  Supported Syncthing features:
 @end itemize\n")
       (license gpl2))))
 
-(define-public qsyncthingtray
-  (deprecated-package "qsyncthingtray" syncthing-gtk))
+(define-deprecated-package qsyncthingtray
+  syncthing-gtk)
 
 (define-public go-github-com-syncthing-notify
   (package

@@ 1259,8 1259,8 @@ while also supporting native scrolling and @command{tmux} control mode
 (@code{tmux -CC}).")
     (license license:asl2.0)))
 
-(define-public wterm
-  (deprecated-package "wterm" foot))
+(define-deprecated-package wterm
+  foot)
 
 (define-public tilix
   (package

@@ 1456,8 1456,8 @@ It uses a plain-text database, a location-independent library, and features
 git integration, command-line support, and a curses-based TUI.")
     (license license:expat)))
 
-(define-public python-cobib
-  (deprecated-package "python-cobib" cobib))
+(define-deprecated-package python-cobib
+  cobib)
 
 (define-public bibutils
   (package

@@ 923,8 923,8 @@ which will be used as a snippet in origin."
                      '("extension_wikilink.txt" "spec.txt" "tags.txt")))
          #$(tree-sitter-delete-generated-files grammar-directories)))))
 
-(define-public tree-sitter-markdown-gfm
-  (deprecated-package "tree-sitter-markdown-gfm" tree-sitter-markdown))
+(define-deprecated-package tree-sitter-markdown-gfm
+  tree-sitter-markdown)
 
 (define-public tree-sitter-matlab
   (tree-sitter-grammar

@@ 304,8 304,8 @@ and protocols.  One of the key differences with Bazaar is that Breezy runs on
 Python 3.3 and later, rather than on Python 2.")
     (license license:gpl2+)))
 
-(define-public bazaar
-  (deprecated-package "bazaar" breezy))
+(define-deprecated-package bazaar
+  breezy)
 
 (define git-cross-configure-flags
   #~(list "ac_cv_fread_reads_directories=yes"


@@ 2713,8 2713,8 @@ specify a list of hooks you want and pre-commit manages the installation and
 execution of any hook written in any language before every commit.")
     (license license:expat)))
 
-(define-public python-pre-commit
-  (deprecated-package "python-pre-commit" pre-commit))
+(define-deprecated-package python-pre-commit
+  pre-commit)
 
 ;; XXX: This is a temporary helper to avoid recompiling mercurial/pinned.
 ;; If you update mercurial, don't touch it but work around it.

@@ 1314,8 1314,8 @@ playing videos from YouTube.  It parses the YouTube website directly and relies
 on the Invidious instances only as a fallback method.")
     (license license:artistic2.0)))
 
-(define-public straw-viewer
-  (deprecated-package "straw-viewer" pipe-viewer))
+(define-deprecated-package straw-viewer
+  pipe-viewer)
 
 (define-public x265
   (package


@@ 3080,8 3080,8 @@ wallpaper using mpv.")
 to download videos from Austria's national television broadcaster.")
     (license license:bsd-3)))
 
-(define-public orf-dl
-  (deprecated-package "orf-dl" orfondl))
+(define-deprecated-package orf-dl
+  orfondl)
 
 (define-public yle-dl
   (package


@@ 4650,9 4650,9 @@ scenes, sources and filters.")
 via a filter.")
     (license license:gpl2)))
 
-(define-public obs-websocket
-  ;; Functionality was merged into OBS.
-  (deprecated-package "obs-websocket" obs))
+;; Functionality was merged into OBS.
+(define-deprecated-package obs-websocket
+  obs)
 
 (define-public obs-wlrobs
   (package


@@ 6980,8 6980,8 @@ Users in group ``wheel'' can skip password authentication.")
     (home-page "https://github.com/AlynxZhou/showmethekey")
     (license license:asl2.0)))
 
-(define-public show-me-the-key
-  (deprecated-package "show-me-the-key" showmethekey))
+(define-deprecated-package show-me-the-key
+  showmethekey)
 
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances

@@ 1887,8 1887,8 @@ C.")
 (SAX-style) JSON parser and validating generator written in ANSI C.")
     (license license:isc)))
 
-(define-public libyajl
-  (deprecated-package "libyajl" yajl))
+(define-deprecated-package libyajl
+  yajl)
 
 (define-public libwebsockets
   (package


@@ 2418,8 2418,8 @@ directions.")
     (description (package-description esbuild))
     (license (package-license esbuild))))
 
-(define-public esbuild-node
-  (deprecated-package "esbuild-node" node-esbuild))
+(define-deprecated-package esbuild-node
+  node-esbuild)
 
 (define-public wwwoffle
   (package


@@ 7226,8 7226,8 @@ developers can integrate into their applications to make use of the
 functions of Tidy.")
     (license license:bsd-3)))
 
-(define-public tidy
-  (deprecated-package "tidy" tidy-html))
+(define-deprecated-package tidy
+  tidy-html)
 
 (define-public hiawatha
   (package

@@ 580,8 580,8 @@ many programming languages.")
        (release-monitoring-url . "https://i3wm.org/downloads")))
     (license license:bsd-3)))
 
-(define-public i3-gaps
-  (deprecated-package "i3-gaps" i3-wm))
+(define-deprecated-package i3-gaps
+  i3-wm)
 
 (define-public i3ipc-glib
   (package


@@ 1822,8 1822,8 @@ Keybinder works with GTK-based applications using the X Window System.")
     (home-page "https://github.com/kupferlauncher/keybinder")
     (license license:x11)))
 
-(define-public keybinder-3.0
-  (deprecated-package "keybinder-3.0" keybinder))
+(define-deprecated-package keybinder-3.0
+  keybinder)
 
 (define-public sandbar
   (package

@@ 2310,8 2310,8 @@ applications you regularly use and also allows you to search for an application
 by name.")
     (license license:expat)))
 
-(define-public rofi-wayland
-  (deprecated-package "rofi-wayland" rofi))
+(define-deprecated-package rofi-wayland
+  rofi)
 
 (define-public rofi-calc
   (package

@@ 94,8 94,8 @@ variety of environments.")
      (license:non-copyleft "file://Makefile.am"
                            "See <https://spdx.org/licenses/Xfig.html>."))))
 
-(define-public transfig
-  (deprecated-package "transfig" fig2dev))
+(define-deprecated-package transfig
+  fig2dev)
 
 (define-public xfig
   (package

@@ 296,8 296,8 @@ project (but it is usable outside of the Gnome platform).")
 provides an @code{--xpath0} option to @command{xmllint} that enables it
 to output XPath results with a null delimiter.")))
 
-(define-public python-libxml2
-  (deprecated-package "python-libxml2" libxml2))
+(define-deprecated-package python-libxml2
+  libxml2)
 
 (define-public libxlsxwriter
   (package