From 9635b811c005d20ce8bcaa1d38a30f07cb398cd0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 1 Oct 2025 22:41:21 +0100 Subject: [PATCH] gnu: python-pyzbar: Refresh package style. * gnu/packages/python-xyz.scm (python-pyzbar): Use G-expressions, remove trailing #t from lambdas, fix indentation, Change-Id: Ie73b72a61cc22190a9ef834d449bf76c90a392b6 --- gnu/packages/python-xyz.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 075348e849681a6cec9ad2219dddf9f874c25675..868c222bfd70c82b9967450e2ed23aacf4445566 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28908,28 +28908,27 @@ Week instances stringify to this form.") ;; There's no source tarball on PyPI. (method git-fetch) (uri (git-reference - (url "https://github.com/NaturalHistoryMuseum/pyzbar") - (commit (string-append "v" version)))) + (url "https://github.com/NaturalHistoryMuseum/pyzbar") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1fqlfg5p2v9lzzzi0si2sz54lblprk6jjjhjw54b64lp58c1yhsl")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-failing-test - (lambda _ - ;; This tests if find_library was called once, but we remove - ;; the call in the stage below to make the library find libzbar. - (delete-file "pyzbar/tests/test_zbar_library.py") - #t)) - (add-before 'build 'set-library-file-name - (lambda* (#:key inputs #:allow-other-keys) - (let ((libzbar (assoc-ref inputs "zbar"))) - (substitute* "pyzbar/zbar_library.py" - (("find_library\\('zbar'\\)") - (string-append "'" libzbar "/lib/libzbar.so.0'"))) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test + (lambda _ + ;; This tests if find_library was called once, but we remove + ;; the call in the stage below to make the library find libzbar. + (delete-file "pyzbar/tests/test_zbar_library.py"))) + (add-before 'build 'set-library-file-name + (lambda _ + (let ((libzbar #$(this-package-input "zbar"))) + (substitute* "pyzbar/zbar_library.py" + (("find_library\\('zbar'\\)") + (string-append "'" libzbar "/lib/libzbar.so.0'"))))))))) (native-inputs (list pkg-config python-numpy python-pillow)) (inputs