gnu: packages: Remove last year's deprecations.

* gnu/packages/admin.scm (guile3.0-shepherd): Remove variable. * gnu/packages/benchmark.scm (imb-openmpi): Likewise. * gnu/packages/boost.scm (boost-with-python3): Likewise. * gnu/packages/pep.scm (python-pep-adapter)[inputs]: Adjust accordingly. * gnu/packages/cpp.scm (nlohmann-json-cpp): Likewise. * gnu/packages/games.scm (openrct2)[inputs]: Adjust accordingly. * gnu/packages/cups.scm (escpr): Likewise. * gnu/packages/django.scm (python-django-jsonfield): Likewise. * gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme) (emacs-modus-vivendi-theme): Likewise. * gnu/packages/engineering.scm (kicad-i18l): Likewise. * gnu/packages/enlightenment.scm (enlightenment-wayland): Likewise. * gnu/packages/firmware.scm (opensbi-qemu-virt, opensbi-qemu-sifive-u): Likewise. * gnu/packages/fonts.scm (font-gnu-freefont-ttf, font-open-dyslexic): Likewise. * gnu/packages/game-development.scm (guile3.0-chickadee) (python-sge-pygame): Likewise. * gnu/packages/games.scm (retux)[inputs]: Adjust accordingly. * gnu/packages/gnome-xyz.scm (numix-theme): Likewise. * gnu/packages/gnupg.scm (guile3.0-gcrypt): Likewise. * gnu/packages/gstreamer.scm (gst-transcoder): Likewise. * gnu/packages/gtk.scm (guile3.0-cairo, guile3.0-present, guile3.0-rsvg): Likewise. * gnu/packages/guile-xyz.scm (guile3.0-colorized, guile3.0-commonmark) (guile3.0-config, guile3.0-email, guile3.0-fibers, guile3.0-gi) (guile3.0-hall, guile3.0-hashing, guile3.0-haunt, guile3.0-ics) (guile3.0-irregex, guile3.0-lib, guile3.0-mcron, guile3.0-minikanren) (guile3.0-ncurses, guile3.0-ncurses/gpm, guile3.0-newt, guile3.0-parted) (guile3.0-pfds, guile3.0-picture-language, guile3.0-semver) (guile3.0-simple-zmq, guile3.0-squee, guile3.0-syntax-highlight) (guile3.0-websocket, guile3.0-wisp, guile3.0-xapian): Likewise. * gnu/packages/guile.scm (define-deprecated-guile3.0-package) (guile3.0-json, guile3.0-gdbm-ffi, guile3.0-sqlite3) (guile3.0-bytestructures, guile3.0-git): Likewise. * gnu/packages/haskell-apps.scm (ghc-stylish-haskell): Likewise. * gnu/packages/linux.scm (linux-libre-arm-veyron): Likewise. * gnu/packages/mail.scm (guile3.0-mailutils): Likewise. * gnu/packages/monitoring.scm (python2-graphite-web): Likewise. * gnu/packages/package-management.scm (guile3.0-guix): Likewise. * gnu/packages/package-management.scm (python-conda): Likewise. * gnu/packages/phabricator.scm (libphutil): Likewise. * gnu/packages/plotutils.scm (guile3.0-charting): Likewise. * gnu/packages/python-xyz.scm (python2-smmap2, python-glances) (python-smmap2): Likewise. * gnu/packages/shells.scm (oil-shell): Likewise. * gnu/packages/sqlite.scm (sqlite-with-column-metadata): Likewise. * gnu/packages/ssh.scm (guile3.0-ssh): Likewise. * gnu/packages/terminals.scm (et): Likewise. * gnu/packages/tls.scm (guile3.0-gnutls): Likewise. * gnu/packages/vlang.scm (v): Likewise. * gnu/packages/vpn.scm (wireguard): Likewise. * gnu/packages/web-browsers.scm (next, sbcl-next): Likewise. * gnu/packages/xorg.scm (transset-df): Likewise.
2021-11-08 20:56:21 +01:00 · 2021-11-08 20:56:21 +01:00 · 9b14b26f0a
parent 590074a749
commit 9b14b26f0a
37 changed files with 3 additions and 272 deletions
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@ -313,9 +313,6 @@ interface and is based on GNU Guile.")
     `(("guile" ,guile-2.2)
       ("guile2.2-readline" ,guile2.2-readline)))))

-(define-public guile3.0-shepherd
-  (deprecated-package "guile3.0-shepherd" shepherd))
-
 (define-public guile2.0-shepherd
  (package
    (inherit shepherd)
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@ -172,9 +172,6 @@ Efficiency of the MPI implementation.
@end itemize")
    (license license:cpl1.0)))

-(define-public imb-openmpi
-  (deprecated-package "imb-openmpi" intel-mpi-benchmarks/openmpi))
-
 (define-public multitime
  (package
    (name "multitime")
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@ -295,9 +295,6 @@ across a broad spectrum of applications.")
     `(("python" ,python-2)
       ,@(alist-delete "python" (package-native-inputs boost))))))

-(define-public boost-with-python3
-  (deprecated-package "boost-with-python3" boost))
-
 (define-public boost-static
  (package
    (inherit boost)
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@ -448,9 +448,6 @@ as ordering relation.")
 intuitive syntax and trivial integration.")
    (license license:expat)))

-(define-public nlohmann-json-cpp
-  (deprecated-package "nlohmann-json-cpp" json-modern-cxx))
-
 (define-public xtl
  (package
    (name "xtl")
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@ -926,9 +926,6 @@ language.")
    (home-page "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX")
    (license license:gpl2+)))

-(define-public escpr
-  (deprecated-package "escpr" epson-inkjet-printer-escpr))
-
 (define-public splix
  ;; Last released in 2009 <https://sourceforge.net/projects/splix/files/>.
  ;; Last SVN commit was 2013 <https://svn.code.sf.net/p/splix/code/splix/>.
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@ -663,10 +663,6 @@ provides certain advantages over the builtin Jinja2 backend in Django, for
 example, explicit calls to callables from templates and better performance.")
    (license license:bsd-3)))

-;; JSONField is now built-in to Django, obsoleting this package.
-(define-public python-django-jsonfield
-  (deprecated-package "python-django-jsonfield" python-django))
-
 (define-public python-dj-database-url
  (package
    (name "python-dj-database-url")
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@ -26653,12 +26653,6 @@ meet the needs of the numerous interfaces that are possible in the Emacs
 computing environment.")
    (license license:gpl3+)))

-(define-public emacs-modus-operandi-theme
-  (deprecated-package "emacs-modus-operandi-theme" emacs-modus-themes))
-
-(define-public emacs-modus-vivendi-theme
-  (deprecated-package "emacs-modus-vivendi-theme" emacs-modus-themes))
-
 (define-public emacs-punpun-theme
  (let ((commit "2f78125609277b2478abdebd8f9d5ee10a823b65")
        (revision "0"))
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@ -1018,9 +1018,6 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
 translations for KiCad.")
    (license license:gpl3+)))

-(define-public kicad-i18l
-  (deprecated-package "kicad-i18l" kicad-i18n))
-
 (define-public kicad-doc
  (package
    (name "kicad-doc")
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@ -384,9 +384,6 @@ unload unused functionality, with support for touchscreen and suitable for
 embedded systems.")
    (license license:bsd-2)))

-(define-public enlightenment-wayland
-  (deprecated-package "enlightenment-wayland" enlightenment))
-
 (define-public python-efl
  (package
    (name "python-efl")
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@ -245,17 +245,9 @@ for platform-specific firmwares executing in M-mode.")
 (define-public opensbi-qemu-generic
  (make-opensbi-package "generic" "opensbi-qemu-generic"))

-(define-public opensbi-qemu-virt
-  (deprecated-package "opensbi-qemu-virt" opensbi-qemu-generic))
-
 (define-public opensbi-sifive-fu540
  (make-opensbi-package "sifive/fu540" "opensbi-sifive-fu540"))

-(define-public opensbi-qemu-sifive-u
-  ;; Dropped upstream, as all functionality is present in the sifive-fu540
-  ;; target for recent versions of qemu, u-boot and linux.
-  (deprecated-package "opensbi-qemu-sifive-u" opensbi-sifive-fu540))
-
 (define-public seabios
  (package
    (name "seabios")
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@ -331,9 +331,6 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over
    (properties '((upstream-name . "freefont")
                  (ftp-directory . "/gnu/freefont")))))

-(define-public font-gnu-freefont-ttf
-  (deprecated-package "font-gnu-freefont-ttf" font-gnu-freefont))
-
 (define-public font-liberation
  (package
    (name "font-liberation")
@ -1593,9 +1590,6 @@ swapping.  The italic style for OpenDyslexic has been crafted to be used for
 emphasis while still being readable.")
    (license license:silofl1.1)))

-(define-public font-open-dyslexic
-  (deprecated-package "font-open-dyslexic" font-opendyslexic))
-
 (define-public font-openmoji
  (package
    (name "font-openmoji")
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@ -375,9 +375,6 @@ you can focus on the game itself.  This makes more rapid game development
 possible, and it also makes the SGE easy to learn.")
    (license license:lgpl3+)))

-(define-public python-sge-pygame
-  (deprecated-package "python-sge-pygame" python-sge))
-
 (define-public python-tmx
  (package
    (name "python-tmx")
@ -2075,9 +2072,6 @@ that parenthetically inclined game developers need to make 2D (and eventually
@end enumerate\n")
    (license license:gpl3+)))

-(define-public guile3.0-chickadee
-  (deprecated-package "guile3.0-chickadee" guile-chickadee))
-
 (define-public bennu-game-development
  (package
    (name "bennu-game-development")
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@ -2258,7 +2258,7 @@ Every puzzle has a complete solution, although there may be more than one.")
      (native-inputs
       `(("unzip" ,unzip)))
      (inputs
-       `(("python-sge-pygame" ,python-sge-pygame)
+       `(("python-sge" ,python-sge)
         ("python-six" ,python-six)
         ("python-xsge" ,python-xsge)))
      (home-page "https://retux-game.github.io/")
@ -4631,10 +4631,10 @@ Transport Tycoon Deluxe.")
              ("freetype" ,freetype)
              ("icu4c" ,icu4c)
              ("jansson" ,jansson)
+              ("json-modern-cxx" ,json-modern-cxx)
              ("libpng" ,libpng)
              ("libzip" ,libzip)
              ("mesa" ,mesa)
-              ("nlohmann-json-cpp" ,nlohmann-json-cpp)
              ("openrct2-objects" ,openrct2-objects)
              ("openrct2-title-sequences" ,openrct2-title-sequences)
              ("openssl" ,openssl)
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@ -779,9 +779,6 @@ dark elements.  It supports GNOME, Unity, Xfce, and Openbox.")
    (home-page "https://numixproject.github.io")
    (license license:gpl3+)))

-(define-public numix-theme
-  (deprecated-package "numix-theme" numix-gtk-theme))
-
 (define-public orchis-theme
  (package
    (name "orchis-theme")
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@ -492,9 +492,6 @@ interface (FFI) of Guile.")
     `(("guile" ,guile-2.2)
       ,@(alist-delete "guile" (package-inputs guile-gcrypt))))))

-(define-public guile3.0-gcrypt
-  (deprecated-package "guile3.0-gcrypt" guile-gcrypt))
-
 (define-public python-gpg
  (package
    (name "python-gpg")
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@ -939,13 +939,6 @@ given, also pass them to the build system instead of the ones used by PKG."
                    (("'auto'") "'disabled'"))
                  #t)))))))))

-(define-public gst-transcoder
-  (deprecated-package
-   "gst-transcoder"
-   (gst-plugins/selection gst-plugins-bad
-                          #:plugins '("transcoder")
-                          #:configure-flags '("-Dintrospection=enabled"))))
-
 (define-public python-gst
  (package
    (name "python-gst")
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@ -1035,9 +1035,6 @@ exceptions, macros, and a dynamic programming environment.")
       ,@(fold alist-delete (package-inputs guile-cairo)
               '("guile" "guile-lib"))))))

-(define-public guile3.0-cairo
-  (deprecated-package "guile3.0-cairo" guile-cairo))
-
 (define-public guile-rsvg
  ;; Use a recent snapshot that supports Guile 2.2 and beyond.
  (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678")
@ -1122,9 +1119,6 @@ images onto Cairo surfaces.")
               '("guile" "guile-lib"))))
    (propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))

-(define-public guile3.0-rsvg
-  (deprecated-package "guile3.0-rsvg" guile-rsvg))
-
 (define-public guile-present
  (package
    (name "guile-present")
@ -1195,9 +1189,6 @@ documents.")
       ("guile-cairo" ,guile2.2-cairo)
       ("guile-rsvg" ,guile2.2-rsvg)))))

-(define-public guile3.0-present
-  (deprecated-package "guile3.0-present" guile-present))
-
 (define-public guile-gnome
   (package
    (name "guile-gnome")
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@ -706,9 +706,6 @@ is not available for Guile 2.0.")
    (name "guile2.2-fibers")
    (inputs `(("guile" ,guile-2.2)))))

-(define-public guile3.0-fibers
-  (deprecated-package "guile3.0-fibers" guile-fibers))
-
 (define-public guile-filesystem
  (package
    (name "guile-filesystem")
@ -811,9 +808,6 @@ HTML (via SXML) or any other format for rendering.")
    (name "guile2.2-syntax-highlight")
    (inputs `(("guile" ,guile-2.2)))))

-(define-public guile3.0-syntax-highlight
-  (deprecated-package "guile3.0-syntax-highlight" guile-syntax-highlight))
-
 (define-public guile-sjson
  (package
    (name "guile-sjson")
@ -899,9 +893,6 @@ using Guile's foreign function interface.")
                     ,@(alist-delete "guile"
                                     (package-native-inputs guile-squee))))))

-(define-public guile3.0-squee
-  (deprecated-package "guile3.0-squee" guile-squee))
-
 (define-public guile-colorized
  (package
    (name "guile-colorized")
@ -930,9 +921,6 @@ using Guile's foreign function interface.")
    (name "guile2.2-colorized")
    (native-inputs `(("guile" ,guile-2.2)))))

-(define-public guile3.0-colorized
-  (deprecated-package "guile3.0-colorized" guile-colorized))
-
 (define-public guile-pfds
  (package
    (name "guile-pfds")
@ -1094,9 +1082,6 @@ types are supported.")
                         (find-files "." "\\.sls$"))
               #t))))))))

-(define-public guile3.0-pfds
-  (deprecated-package "guile3.0-pfds" guile-pfds))
-
 (define-public guile-aa-tree
  (package
    (name "guile-aa-tree")
@ -1162,9 +1147,6 @@ messaging library.")
    (name "guile2.2-simple-zmq")
    (native-inputs `(("guile" ,guile-2.2)))))

-(define-public guile3.0-simple-zmq
-  (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq))
-
 (define-public jupyter-guile-kernel
  (let ((commit "f25fb90b95529b17a006a807bd04e6aee12ea304")
        (revision "2"))
@ -1361,9 +1343,6 @@ format.")
    (inputs `(("guile" ,guile-2.2)
              ,@(alist-delete "guile" (package-inputs guile-email))))))

-(define-public guile3.0-email
-  (deprecated-package "guile3.0-email" guile-email))
-
 (define-public guile-newt
  (package
    (name "guile-newt")
@ -1403,9 +1382,6 @@ Scheme by using Guile’s foreign function interface.")
    (inputs `(("guile" ,guile-2.2)
              ,@(alist-delete "guile" (package-inputs guile-newt))))))

-(define-public guile3.0-newt
-  (deprecated-package "guile3.0-newt" guile-newt))
-
 (define-public guile-mastodon
  (let ((commit "74b75bcf547df92acee1e0466ecd7ec07f775392")
        (revision "1"))
@ -1483,9 +1459,6 @@ written in pure Scheme by using Guile's foreign function interface.")
    (propagated-inputs
     `(("guile-bytestructures" ,guile2.2-bytestructures)))))

-(define-public guile3.0-parted
-  (deprecated-package "guile3.0-parted" guile-parted))
-
 (define-public guile-xosd
  (package
    (name "guile-xosd")
@ -1706,9 +1679,6 @@ above command-line parameters.")
    (inputs `(("guile" ,guile-2.2)
              ,@(alist-delete "guile" (package-inputs guile-config))))))

-(define-public guile3.0-config
-  (deprecated-package "guile3.0-config" guile-config))
-
 (define-public guile-hall
  (package
    (name "guile-hall")
@ -1798,9 +1768,6 @@ provides tight coupling to Guix.")
       ,@(alist-delete "guile-config"
                       (package-propagated-inputs guile-hall))))))

-(define-public guile3.0-hall
-  (deprecated-package "guile3.0-hall" guile-hall))
-
 (define-public guile-ics
  (package
    (name "guile-ics")
@ -1849,9 +1816,6 @@ The library is shipped with documentation in Info format and usage examples.")
              ,@(alist-delete "guile" (package-inputs guile-ics))))
    (propagated-inputs `(("guile-lib" ,guile2.2-lib)))))

-(define-public guile3.0-ics
-  (deprecated-package "guile3.0-ics" guile-ics))
-
 (define-public guile-imanifest
  (let ((commit "ccd5a2111b008d778106f5595a3a585954d95d0")
        (revision "0"))
@ -1969,9 +1933,6 @@ users and in some situations.")
    (name "guile2.2-wisp")
    (inputs `(("guile" ,guile-2.2)))))

-(define-public guile3.0-wisp
-  (deprecated-package "guile3.0-wisp" guile-wisp))
-
 (define-public guile-udev
  (package
    (name "guile-udev")
@ -2335,9 +2296,6 @@ library.")
    (inputs `(("ncurses" ,ncurses)
              ("guile" ,guile-2.2)))))

-(define-public guile3.0-ncurses
-  (deprecated-package "guile3.0-ncurses" guile-ncurses))
-
 (define-public guile-ncurses/gpm
  (package
    (inherit guile-ncurses)
@ -2345,13 +2303,6 @@ library.")
    (inputs `(("ncurses" ,ncurses/gpm)
              ("guile" ,guile-3.0)))))

-(define-public guile3.0-ncurses/gpm
-  (package
-    (inherit guile3.0-ncurses)
-    (name "guile3.0-ncurses-with-gpm")
-    (inputs `(("ncurses" ,ncurses/gpm)
-              ("guile" ,guile-3.0)))))
-
 (define-public guile-lib
  (package
    (name "guile-lib")
@ -2447,9 +2398,6 @@ for Guile\".  It provides the following modules:
     (alist-replace "guile" (list guile-2.2)
                    (package-inputs guile-lib)))))

-(define-public guile3.0-lib
-  (deprecated-package "guile3.0-lib" guile-lib))
-
 (define-public guile-minikanren
  (package
    (name "guile-minikanren")
@ -2492,9 +2440,6 @@ See http://minikanren.org/ for more on miniKanren generally.")
    (name "guile2.2-minikanren")
    (native-inputs `(("guile" ,guile-2.2)))))

-(define-public guile3.0-minikanren
-  (deprecated-package "guile3.0-minikanren" guile-minikanren))
-
 (define-public guile-irregex
  (package
    (name "guile-irregex")
@ -2547,9 +2492,6 @@ inspired by the SCSH regular expression system.")
    (name "guile2.2-irregex")
    (native-inputs `(("guile" ,guile-2.2)))))

-(define-public guile3.0-irregex
-  (deprecated-package "guile3.0-irregex" guile-irregex))
-
 (define-public haunt
  (package
    (name "haunt")
@ -2634,9 +2576,6 @@ interface for reading articles in any format.")
    (name "guile2.0-haunt")
    (inputs `(("guile" ,guile-2.0)))))

-(define-public guile3.0-haunt
-  (deprecated-package "guile3.0-haunt" haunt))
-
 (define-public guile-redis
  (package
    (name "guile-redis")
@ -2752,9 +2691,6 @@ is no support for parsing block and inline level HTML.")
    (name "guile2.0-commonmark")
    (inputs `(("guile" ,guile-2.0)))))

-(define-public guile3.0-commonmark
-  (deprecated-package "guile3.0-commonmark" guile-commonmark))
-
 (define-public mcron
  (package
    (name "mcron")
@ -2805,9 +2741,6 @@ format is also supported.")
    (name "guile2.2-mcron")
    (inputs `(("guile" ,guile-2.2)))))

-(define-public guile3.0-mcron
-  (deprecated-package "guile3.0-mcron" mcron))
-
 (define-public guile-picture-language
  (let ((commit "a1322bf11945465241ca5b742a70893f24156d12")
        (revision "5"))
@ -2853,10 +2786,6 @@ The picture values can directly be displayed in Geiser.")
     `(("guile-cairo" ,guile2.2-cairo)
       ("guile-rsvg" ,guile2.2-rsvg)))))

-(define-public guile3.0-picture-language
-  (deprecated-package "guile3.0-picture-language"
-                      guile-picture-language))
-
 (define-public guile-studio
  (let ((commit "dd0ad42e51feafebda7cc29afe7c8bc7a182a842")
        (revision "1"))
@ -3208,9 +3137,6 @@ pre-alpha code.")
     `(("guile" ,guile-2.2)
       ,@(alist-delete "guile" (package-inputs guile-gi))))))

-(define-public guile3.0-gi
-  (deprecated-package "guile3.0-gi" guile-gi))
-
 (define-public guile-srfi-89
  (package
    (name "guile-srfi-89")
@ -3794,9 +3720,6 @@ comparing, and writing Semantic Versions.  It also includes ranges in
 the style of the Node Package Manager (NPM).")
    (license license:gpl3+)))

-(define-public guile3.0-semver
-  (deprecated-package "guile3.0-semver" guile-semver))
-
 (define-public guile2.2-semver
  (package
    (inherit guile-semver)
@ -3862,9 +3785,6 @@ SHA-512).")
    (native-inputs
     `(("guile" ,guile-2.2)))))

-(define-public guile3.0-hashing
-  (deprecated-package "guile3.0-hashing" guile-hashing))
-
 (define-public guile-packrat
  (package
    (name "guile-packrat")
@ -4107,9 +4027,6 @@ models and also supports a rich set of boolean query operators.")
     `(("guile" ,guile-2.2)
       ,@(alist-delete "guile" (package-inputs guile-xapian))))))

-(define-public guile3.0-xapian
-  (deprecated-package "guile3.0-xapian" guile-xapian))
-
 (define-public guile-torrent
  (package
    (name "guile-torrent")
@ -4204,9 +4121,6 @@ WebSocket protocol as defined by RFC 6455.")
      (home-page "https://git.dthompson.us/guile-websocket.git")
      (license license:lgpl3+))))

-(define-public guile3.0-websocket
-  (deprecated-package "guile3.0-websocket" guile-websocket))
-
 (define-public guile-rdf
  (package
    (name "guile-rdf")
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@ -479,39 +479,6 @@ GNU@tie{}Guile.  Use the @code{(ice-9 readline)} module and call its
                           (guile-variant-package-name "guile2.2")
                           #:deep? #f))

-(define-syntax define-deprecated-guile3.0-package
-  (lambda (s)
-    "Define a deprecated package alias for \"guile3.0-something\"."
-    (syntax-case s ()
-      ((_ name)
-       (and (identifier? #'name)
-            (string-prefix? "guile3.0-" (symbol->string (syntax->datum
-                                                         #'name))))
-       (let ((->guile (lambda (str)
-                        (let ((base (string-drop str
-                                                 (string-length "guile3.0-"))))
-                          (string-append "guile-" base)))))
-         (with-syntax ((package-name (symbol->string (syntax->datum #'name)))
-                       (package
-                         (datum->syntax
-                          #'name
-                          (string->symbol
-                           (->guile (symbol->string (syntax->datum
-                                                     #'name))))))
-                       (old-name
-                        ;; XXX: This is the name generated by
-                        ;; 'define-deprecated'.
-                        (datum->syntax
-                         #'name
-                         (symbol-append '% (syntax->datum #'name)
-                                        '/deprecated))))
-           #'(begin
-               (define-deprecated name package
-                 (deprecated-package package-name package))
-               (export old-name))))))))
-
-(define-deprecated-guile3.0-package guile3.0-readline)
-
 (define-public guile-for-guile-emacs
  (let ((commit "15ca78482ac0dd2e3eb36dcb31765d8652d7106d")
        (revision "1"))
@ -622,9 +589,6 @@ specification.  These are the main features:
                     ("guile" ,guile-3.0)))
    (inputs `(("guile" ,guile-3.0)))))

-(define-public guile3.0-json
-  (deprecated-package "guile3.0-json" guile-json-3))
-
 (define-public guile-json-4
  (package
    (inherit guile-json-3)
@ -696,8 +660,6 @@ Guile's foreign function interface.")
 (define-public guile2.2-gdbm-ffi
  (package-for-guile-2.2 guile-gdbm-ffi))

-(define-deprecated-guile3.0-package guile3.0-gdbm-ffi)
-
 (define-public guile-sqlite3
  (package
    (name "guile-sqlite3")
@ -732,8 +694,6 @@ Guile's foreign function interface.")
 (define-public guile2.2-sqlite3
  (package-for-guile-2.2 guile-sqlite3))

-(define-deprecated-guile3.0-package guile3.0-sqlite3)
-
 (define-public guile-bytestructures
  (package
    (name "guile-bytestructures")
@ -783,8 +743,6 @@ type system, elevating types to first-class status.")
 (define-public guile2.2-bytestructures
  (package-for-guile-2.2 guile-bytestructures))

-(define-deprecated-guile3.0-package guile3.0-bytestructures)
-
 (define-public guile-git
  (package
    (name "guile-git")
@ -826,8 +784,6 @@ manipulate repositories of the Git version control system.")
 (define-public guile2.0-git
  (package-for-guile-2.0 guile-git))

-(define-deprecated-guile3.0-package guile3.0-git)
-
 (define-public guile-zlib
  (package
    (name "guile-zlib")
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@ -982,6 +982,3 @@ Replace some ASCII sequences by their Unicode equivalent (turned off by
 default)
@end itemize")
    (license license:bsd-3)))
-
-(define-public ghc-stylish-haskell
-  (deprecated-package "ghc-stylish-haskell" stylish-haskell))
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@ -993,9 +993,6 @@ It has been modified to remove all non-free binary blobs.")
                        ("CONFIG_RTC_DRV_RK808" . #t))
                      %default-extra-linux-options)))

-(define-public linux-libre-arm-veyron
-  (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic))
-
 (define-public linux-libre-arm-generic-5.10
  (make-linux-libre* linux-libre-5.10-version
                     linux-libre-5.10-gnu-revision
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@ -434,9 +434,6 @@ messages) using IDLE.  Implemented in Go.")
     `(("guile" ,guile-2.2)
       ,@(alist-delete "guile" (package-inputs mailutils))))))

-(define-public guile3.0-mailutils
-  (deprecated-package "guile3.0-mailutils" mailutils))
-
 (define-public nullmailer
  (package
    (name "nullmailer")
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@ -451,9 +451,6 @@ two things: store numeric time-series data, and render graphs of this data on
 demand.")
    (license license:asl2.0)))

-(define-public python2-graphite-web
-  (deprecated-package "python2-graphite-web" graphite-web))
-
 (define-public python-prometheus-client
  (package
    (name "python-prometheus-client")
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@ -528,9 +528,6 @@ the Nix package manager.")
               (invoke "make" "install-binPROGRAMS")))
           (delete 'wrap-program)))))))

-(define-public guile3.0-guix
-  (deprecated-package "guile3.0-guix" guix))
-
 (define-public guix-minimal
  ;; A version of Guix which is built with the minimal set of dependencies, as
  ;; outlined in the README "Requirements" section.  Intended as a CI job, so
@ -980,9 +977,6 @@ it easy to create independent environments even for C libraries.  Conda is
 written entirely in Python.")
    (license license:bsd-3)))

-(define-public python-conda
-  (deprecated-package "python-conda" conda))
-
 (define-public conan
  (package
    (name "conan")
--- a/gnu/packages/pep.scm
+++ b/gnu/packages/pep.scm
@ -241,7 +241,7 @@ ENGINE_INC_PATH=~a/include
     `(("python-pytest" ,python-pytest)
       ("python-pytest-forked" ,python-pytest-forked)))
    (inputs
-     `(("boost-python" ,boost-with-python3)
+     `(("boost" ,boost)
       ("libpepadapter" ,libpepadapter)
       ("pep-engine" ,pep-engine)
       ("python-setuptools-scm" ,python-setuptools-scm/next)
--- a/gnu/packages/phabricator.scm
+++ b/gnu/packages/phabricator.scm
@ -83,6 +83,3 @@ send code for review, download patches, transfer files, view status, make API
 calls, and various other things.")
      ;; Bundled libraries are expat-licensed.
      (license (list license:asl2.0 license:expat)))))
-
-(define-public libphutil
-  (deprecated-package "libphutil" arcanist))
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@ -137,9 +137,6 @@ using the Cairo drawing library.")
    (inputs `(("guile" ,guile-2.2)))
    (propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))

-(define-public guile3.0-charting
-  (deprecated-package "guile3.0-charting" guile-charting))
-
 (define-public ploticus
  (package
    (name "ploticus")
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@ -16828,9 +16828,6 @@ Glances uses the PsUtil library to get information from your system.  It
 monitors CPU, load, memory, network bandwidth, disk I/O, disk use, and more.")
  (license license:lgpl3+)))

-(define-public python-glances
-  (deprecated-package "python-glances" glances))
-
 (define-public python-graphql-core
  (package
    (name "python-graphql-core")
@ -19498,15 +19495,9 @@ many of the popular cloud service providers using a unified API.")
 window memory map manager.")
    (license license:bsd-3)))

-(define-public python-smmap2
-  (deprecated-package "python-smmap2" python-smmap))
-
 (define-public python2-smmap
  (package-with-python2 python-smmap))

-(define-public python2-smmap2
-  (deprecated-package "python2-smmap2" python2-smmap))
-
 (define-public python-regex
  (package
    (name "python-regex")
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@ -869,9 +869,6 @@ scripts.")
    (license (list license:psfl                 ; tarball includes python2.7
                   license:asl2.0))))

-(define-public oil-shell
-  (deprecated-package "oil-shell" oil))
-
 (define-public gash
  (package
    (name "gash")
--- a/gnu/packages/sqlite.scm
+++ b/gnu/packages/sqlite.scm
@ -143,8 +143,3 @@ is in the public domain.")
              (sha256
               (base32
                "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3"))))))
-
-;; Column metadata support was added to the regular 'sqlite' package with
-;; commit fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7.
-(define-public sqlite-with-column-metadata
-  (deprecated-package "sqlite-with-column-metadata" sqlite))
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@ -397,9 +397,6 @@ libssh library.")
    (inputs `(("guile" ,guile-2.2)
              ,@(alist-delete "guile" (package-inputs guile-ssh))))))

-(define-public guile3.0-ssh
-  (deprecated-package "guile3.0-ssh" guile-ssh))
-
 (define-public corkscrew
  ;; The last 2.0 release hails from 2009.  Use a fork (submitted upstream as
  ;; <https://github.com/patpadgett/corkscrew/pull/5>) that adds now-essential
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@ -1225,9 +1225,6 @@ while also supporting native scrolling and @command{tmux} control mode
 (@code{tmux -CC}).")
    (license license:asl2.0)))

-(define-public et
-  (deprecated-package "et" eternalterminal))
-
 (define-public wterm
  (package
    (name "wterm")
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@ -368,9 +368,6 @@ required structures.")
              ,@(alist-delete "guile"
                              (package-inputs gnutls))))))

-(define-public guile3.0-gnutls
-  (deprecated-package "guile3.0-gnutls" gnutls))
-
 (define-public openssl
  (package
   (name "openssl")
--- a/gnu/packages/vlang.scm
+++ b/gnu/packages/vlang.scm
@ -134,7 +134,3 @@
    "V is a systems programming language.  It provides memory safety and thread
 safety guarantees with minimal abstraction.")
   (license license:expat)))
-
-(define-public v
-  ;; We used to provide 'vlang' under the name 'v'.
-  (deprecated-package "v" vlang))
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@ -1085,9 +1085,6 @@ public keys and can roam across IP addresses.")
     (list license:lgpl2.1+    ; src/netlink.h & contrib/embeddable-wg-library
           license:gpl2))))    ; everything else

-(define-public wireguard
-  (deprecated-package "wireguard" wireguard-tools))
-
 (define-public xl2tpd
  (package
    (name "xl2tpd")
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@ -690,12 +690,6 @@ for power users.  Conceptually inspired by Emacs and Vim, it has familiar
 key-bindings (Emacs, vi, CUA), and is fully configurable in Common Lisp.")
    (license license:bsd-3)))

-(define-public next
-  (deprecated-package "next" nyxt))
-
-(define-public sbcl-next
-  (deprecated-package "sbcl-next" nyxt))
-
 (define-public lagrange
  (package
    (name "lagrange")
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@ -6639,9 +6639,6 @@ user set the transparency on a window.")
    (home-page "https://gitlab.freedesktop.org/xorg/app/transset")
    (license license:x11)))

-(define-public transset-df
-  (deprecated-package "transset-df" transset))
-
 (define-public bdfresize
  (package
    (name "bdfresize")