gnu: dico: Use Python 3.

* gnu/packages/dico.scm (dico)[source]: Fix indentation.
[phases]: Delete trailing #t.
[inputs]: Use new style.  Replace python-2 with python-wrapper.
This commit is contained in:
Maxim Cournoyer 2022-05-13 13:20:16 -04:00
parent 08c19564c4
commit 2095589484
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -3,6 +3,7 @@
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -41,12 +42,12 @@ (define-public dico
(name "dico") (name "dico")
(version "2.11") (version "2.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/dico/dico-" (uri (string-append "mirror://gnu/dico/dico-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0nic4mggc0yhms130k7x4qp5k9c42fwg6n8hmk5cmynh6gi9h7xc")))) "0nic4mggc0yhms130k7x4qp5k9c42fwg6n8hmk5cmynh6gi9h7xc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags (list (string-append "--with-guile-site-dir=" %output '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output
@ -59,23 +60,22 @@ (define-public dico
;; Guile is too talkative, which disturbs the test ;; Guile is too talkative, which disturbs the test
;; infrastructure. Gag it. ;; infrastructure. Gag it.
(setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_AUTO_COMPILE" "0")
(setenv "GUILE_WARN_DEPRECATED" "no") (setenv "GUILE_WARN_DEPRECATED" "no")))
#t))
(replace 'check (replace 'check
(lambda _ (lambda _
;; Test '71: append + dooffs + env' fails if $V is not 2. ;; Test '71: append + dooffs + env' fails if $V is not 2.
(invoke "make" "check" "V=2")))))) (invoke "make" "check" "V=2"))))))
(native-inputs (list groff)) (native-inputs (list groff))
(inputs (inputs
`(("m4" ,m4) ;used at run time (list m4 ;used at run time
("pcre" ,pcre) pcre
("python" ,python-2) python-wrapper
("guile" ,guile-2.2) guile-2.2
("gsasl" ,gsasl) gsasl
("readline" ,readline) readline
("zlib" ,zlib) zlib
("wordnet" ,wordnet) wordnet
("libltdl" ,libltdl))) libltdl))
(home-page "https://www.gnu.org/software/dico/") (home-page "https://www.gnu.org/software/dico/")
(synopsis "Implementation of DICT server (RFC 2229)") (synopsis "Implementation of DICT server (RFC 2229)")
(description (description
@ -84,4 +84,4 @@ (define-public dico
regardless of format, thanks to its modular structure. New modules may be regardless of format, thanks to its modular structure. New modules may be
written in C, Guile or Python. Dico also includes a command-line client, written in C, Guile or Python. Dico also includes a command-line client,
which may be used to query remote dictionary databases.") which may be used to query remote dictionary databases.")
(license gpl3+))) (license gpl3+)))