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.
This commit is contained in:
Ludovic Courtès 2020-01-10 11:28:59 +01:00
parent 6e36f1cabd
commit 9b65dea806
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 7 additions and 10 deletions

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2016, 2018 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -460,9 +460,7 @@ (define-public guile-json-1
;; 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

View file

@ -7,7 +7,7 @@
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -297,7 +297,7 @@ (define-public kdevelop-pg-qt
(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

View file

@ -159,8 +159,7 @@ (define-public hwloc-2
"-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.

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
@ -588,7 +588,7 @@ (define-public qtbase
;; qt used to refer to the monolithic Qt 5.x package
(define-deprecated qt qtbase qtbase)
(define-deprecated qt qtbase)
(define-public qtsvg