02/12: gnu: Use the two-element 'define-deprecated' form where applicable.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 9b65dea806431ec8491184c3e89bab457042a68b
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Jan 10 11:28:59 2020 +0100

    gnu: Use the two-element 'define-deprecated' form where applicable.
    
    * gnu/packages/guile.scm (guile-json): Use the two-element
    'define-deprecated' form.
    * gnu/packages/kde.scm (kdevplatform): Likewise.
    * gnu/packages/mpi.scm (hwloc-2.0): Likewise.
    * gnu/packages/qt.scm (qt): Likewise.
---
 gnu/packages/guile.scm | 6 ++----
 gnu/packages/kde.scm   | 4 ++--
 gnu/packages/mpi.scm   | 3 +--
 gnu/packages/qt.scm    | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 30a72ec..bcb8ff1 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
<address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic 
Courtès <address@hidden>
 ;;; Copyright © 2014 Cyril Roelandt <address@hidden>
 ;;; Copyright © 2014, 2016, 2018 David Thompson <address@hidden>
 ;;; Copyright © 2014, 2017, 2018 Mark H Weaver <address@hidden>
@@ -460,9 +460,7 @@ specification.  These are the main features:
 ;; Deprecate the 'guile-json' alias to force the use 'guile-json-1' or
 ;; 'guile-json-3'.  In the future, we may reuse 'guile-json' as an alias for
 ;; 'guile-json-3'.
-(define-deprecated guile-json
-  guile-json-1
-  guile-json-1)
+(define-deprecated guile-json guile-json-1)
 (export guile-json)
 
 (define-public guile2.0-json
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 1620cb1..bb5c250 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2018 Gábor Boskovits <address@hidden>
 ;;; Copyright © 2019 Nicolas Goaziou <address@hidden>
 ;;; Copyright © 2018, 2019 Hartmut Goebel <address@hidden>
-;;; Copyright © 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2019, 2020 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -297,7 +297,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
     (license license:lgpl2.0+)))
 
 ;; kdevplatform was merged into kdevelop as of 5.2.x
-(define-deprecated kdevplatform kdevelop kdevelop)
+(define-deprecated kdevplatform kdevelop)
 
 (define-public krita
   (package
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 55641d8..00e0d12 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -159,8 +159,7 @@ bind processes, and much more.")
                   "-1"))
                #t))))))))
 
-(define-deprecated hwloc-2.0 'hwloc-2
-  hwloc-2)
+(define-deprecated hwloc-2.0 hwloc-2)
 
 (define-public hwloc
   ;; The latest stable series of hwloc.
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7c2cb0a..5145776 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015 Andreas Enge <address@hidden>
 ;;; Copyright © 2015 Sou Bunnbu <address@hidden>
-;;; Copyright © 2015, 2018, 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2015, 2018, 2019, 2020 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016, 2017 ng0 <address@hidden>
 ;;; Copyright © 2016 Thomas Danckaert <address@hidden>
@@ -588,7 +588,7 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
 
 
 ;; qt used to refer to the monolithic Qt 5.x package
-(define-deprecated qt qtbase qtbase)
+(define-deprecated qt qtbase)
 
 
 (define-public qtsvg