From bb22c1ba5d37773639a3a6d3eb7f83f5504f91af Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 15:39:31 -0400 Subject: gnu: python-cantools: Update to 37.0.7. * gnu/packages/python-xyz.scm (python-cantools): Update to 37.0.7. [arguments]: Use gexps. [phases]: Strip trailing #t. {build-doc}: Use make -C instead of with-directory-excursion. {install-doc}: Adjust for gexp. [native-inputs]: Use new style. [propagated-inputs]: Add python-argparse-addons, python-crccheck, python-matplotlib and python-parameterized. --- gnu/packages/python-xyz.scm | 54 +++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d46b129329..928e0aac9c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2311,7 +2311,7 @@ (define-public python-bitstruct (define-public python-cantools (package (name "python-cantools") - (version "33.1.1") + (version "37.0.7") (source (origin ;; We take the sources from the Git repository as the documentation is @@ -2323,34 +2323,36 @@ (define-public python-cantools (file-name (git-file-name name version)) (sha256 (base32 - "1aad137yd8b4jkfvlv812qsxmxcgra7g1p4wbxfsjy1cbf8fbq9q")))) + "1qcf1fcwif7w70qmhxw2b8kqh420igbinq60p1chzf98xcb0ansx")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-doc - (lambda _ - ;; See: https://github.com/eerimoq/cantools/issues/190. - (substitute* "README.rst" - (("https://github.com/eerimoq/cantools/raw/master\ + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda _ + ;; See: https://github.com/eerimoq/cantools/issues/190. + (substitute* "README.rst" + (("https://github.com/eerimoq/cantools/raw/master\ /docs/monitor.png") - "monitor.png")) - (with-directory-excursion "docs" - (invoke "make" "man" "info")))) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info")) - (man1 (string-append out "/share/man/man1"))) - (format #t "CWD: ~s~%" (getcwd)) - (install-file "docs/_build/texinfo/cantools.info" info) - (install-file "docs/_build/man/cantools.1" man1) - #t)))))) - (native-inputs - `(("sphinx" ,python-sphinx) - ("texinfo" ,texinfo))) - (propagated-inputs - (list python-bitstruct python-can python-diskcache python-textparser)) + "monitor.png")) + (invoke "make" "-C" "docs" "man" "info"))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((info (string-append #$output "/share/info")) + (man1 (string-append #$output "/share/man/man1"))) + (install-file "docs/_build/texinfo/cantools.info" info) + (install-file "docs/_build/man/cantools.1" man1))))))) + (native-inputs (list python-sphinx texinfo)) + (propagated-inputs + (list python-argparse-addons + python-bitstruct + python-can + python-crccheck + python-diskcache + python-matplotlib + python-parameterized + python-textparser)) (home-page "https://github.com/eerimoq/cantools") (synopsis "Tools for the Controller Area Network (CAN) bus protocol") (description "This package includes Controller Area Network (CAN) related -- cgit v1.2.3