From aa2441c2cf0fe5d891bd1714c20e15fedf57e76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 28 Sep 2019 23:25:29 +0200
Subject: [PATCH] gnu: Remove deprecated "guile2.2-" packages.

These had been deprecated since Dec. 2017.

* gnu/packages/guile-xyz.scm (guile2.2-reader, guile2.2-lib)
(guile2.2-minikanren, guile2.2-irregex, guile2.2-haunt)
(guile2.2-redis, guile2.2-commonmark): Remove.
* gnu/packages/guile.scm (guile2.2-json, guile2.2-gdbm-ffi): Remove.
* gnu/packages/ssh.scm (guile2.2-ssh): Remove.
* gnu/packages/tls.scm (gnutls/guile-2.2): Remove.
---
 gnu/packages/guile-xyz.scm | 21 ---------------------
 gnu/packages/guile.scm     |  6 ------
 gnu/packages/ssh.scm       |  3 ---
 gnu/packages/tls.scm       |  5 +----
 4 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 43a599b503..4738addba1 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1591,9 +1591,6 @@ many readers as needed).")
     (home-page "https://www.nongnu.org/guile-reader/")
     (license license:gpl3+)))
 
-(define-public guile2.2-reader
-  (deprecated-package "guile2.2-reader" guile-reader))
-
 (define-public guile-ncurses
   (package
     (name "guile-ncurses")
@@ -1689,9 +1686,6 @@ for Guile\".")
     (name "guile2.0-lib")
     (inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-lib
-  (deprecated-package "guile2.2-lib" guile-lib))
-
 (define-public guile-minikanren
   (package
     (name "guile-minikanren")
@@ -1728,9 +1722,6 @@ See http://minikanren.org/ for more on miniKanren generally.")
     (name "guile2.0-minikanren")
     (native-inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-minikanren
-  (deprecated-package "guile2.2-minikanren" guile-minikanren))
-
 (define-public guile-irregex
   (package
     (name "guile-irregex")
@@ -1777,9 +1768,6 @@ inspired by the SCSH regular expression system.")
     (name "guile2.0-irregex")
     (native-inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-irregex
-  (deprecated-package "guile2.2-irregex" guile-irregex))
-
 (define-public haunt
   (package
     (name "haunt")
@@ -1850,9 +1838,6 @@ interface for reading articles in any format.")
     (name "guile2.0-haunt")
     (inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-haunt
-  (deprecated-package "guile2.2-haunt" haunt))
-
 (define-public guile-redis
   (package
     (name "guile-redis")
@@ -1883,9 +1868,6 @@ key-value cache and store.")
                      ,@(alist-delete "guile"
                                      (package-native-inputs guile-redis))))))
 
-(define-public guile2.2-redis
-  (deprecated-package "guile2.2-redis" guile-redis))
-
 (define-public guile-commonmark
   (package
     (name "guile-commonmark")
@@ -1919,9 +1901,6 @@ is no support for parsing block and inline level HTML.")
     (name "guile2.0-commonmark")
     (inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-commonmark
-  (deprecated-package "guile2.2-commonmark" guile-commonmark))
-
 (define-public mcron
   (package
     (name "mcron")
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 0731caedc2..e845fef0a5 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -472,9 +472,6 @@ specification.  These are the main features:
   ;; This is the 1.x branch of Guile-JSON.
   guile-json)
 
-(define-public guile2.2-json
-  (deprecated-package "guile2.2-json" guile-json))
-
 (define-public guile2.0-json
   (package-for-guile-2.0 guile-json))
 
@@ -544,9 +541,6 @@ Guile's foreign function interface.")
 (define-public guile2.0-gdbm-ffi
   (package-for-guile-2.0 guile-gdbm-ffi))
 
-(define-public guile2.2-gdbm-ffi
-  (deprecated-package "guile2.2-gdbm-ffi" guile-gdbm-ffi))
-
 (define-public guile-sqlite3
   (package
     (name "guile-sqlite3")
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index f7eee359ac..a57096ee18 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -340,9 +340,6 @@ programs written in GNU Guile interpreter.  It is a wrapper to the underlying
 libssh library.")
     (license license:gpl3+)))
 
-(define-public guile2.2-ssh
-  (deprecated-package "guile2.2-ssh" guile-ssh))
-
 (define-public guile2.0-ssh
   (package
     (inherit guile-ssh)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 93c79d63e4..e8406a8ae8 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
@@ -244,9 +244,6 @@ required structures.")
     (properties '((ftp-server . "ftp.gnutls.org")
                   (ftp-directory . "/gcrypt/gnutls")))))
 
-(define-public gnutls/guile-2.2
-  (deprecated-package "guile2.2-gnutls" gnutls))
-
 (define-public gnutls/guile-2.0
   ;; GnuTLS for Guile 2.0.
   (package