diff options
Diffstat (limited to 'gnu/packages/cups.scm')
| -rw-r--r-- | gnu/packages/cups.scm | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8322818b77..ad9779cb2e 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -7,11 +7,12 @@ ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2025 Lukas Gradl <lgradl@posteo.net> ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net> ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2025 John Kehayias <john@guixotic.coop> ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages scanner) @@ -61,6 +63,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix gexp) @@ -319,7 +322,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") (define-public cups-minimal (package (name "cups-minimal") - (version "2.4.9") + (version "2.4.14") (source (origin (method git-fetch) @@ -329,8 +332,8 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") ;; Avoid NAME confusion: these are the complete CUPS sources. (file-name (git-file-name "cups" version)) (sha256 - (base32 "08wjd1flyaslhnwvxl39403qi3g675rk532ysiyk6cda4r8ks1g1")) - (patches (search-patches "cups-minimal-Address-PPD-injection-issues.patch")))) + (base32 "1dk5salizxy1qm19gw93ffdd34hsn1cd4s57nwl7nfhwwirkiri2")) + (patches (search-patches "cups-relax-root-ownership-check.patch")))) (build-system gnu-build-system) (arguments (list #:configure-flags @@ -701,6 +704,14 @@ should only be used as part of the Guix cups-pk-helper service.") (string-append "rulessystemdir = " out "/lib/systemd/system")) (("/etc/sane.d") (string-append out "/etc/sane.d")))))) + (add-after 'install 'move-sane-config-to-dll.d + (lambda _ + ;; move dll.conf to dll.d - the directory intended for 3rd-party + ;; backend configurations. + (let ((dll.d (string-append #$output "/etc/sane.d/dll.d")) + (dll.conf (string-append #$output "/etc/sane.d/dll.conf"))) + (mkdir-p dll.d) + (rename-file dll.conf (string-append dll.d "/hpaio"))))) (add-after 'install 'install-models-dat (lambda* (#:key outputs #:allow-other-keys) (install-file "data/models/models.dat" @@ -749,7 +760,7 @@ should only be used as part of the Guix cups-pk-helper service.") python-pygobject python-pyqt python-wrapper - sane-backends-minimal + sane net-snmp openssl avahi @@ -787,7 +798,7 @@ should only be used as part of the Guix cups-pk-helper service.") dbus libjpeg-turbo libusb - sane-backends-minimal + sane zlib)) (synopsis "GUI-less version of hplip"))) @@ -1078,20 +1089,24 @@ obtained and installed separately.") (define-public python-pycups (package (name "python-pycups") - (version "2.0.1") + (version "2.0.4") (source (origin - (method url-fetch) - (uri (pypi-uri "pycups" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/zdohnal/pycups") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "140c7073bkhx8w9qpaynllhynkkg0rzj3a4wjh9fnj15yvjlqhsp")))) - (build-system python-build-system) + (base32 "1fx2b04wr9mv87lxk8jpglkyaqwj7bhlj6hnai0dji3jm503dqlb")))) + (build-system pyproject-build-system) (arguments - '(;; Tests require CUPS to be running - #:tests? #f)) - (inputs - (list cups)) + (list + ;; XXX: Tests require CUPS to be running, a cups configuration, and + ;; access to associated printers. + #:tests? #f)) + (inputs (list cups)) + (native-inputs (list python-setuptools python-wheel)) (home-page "https://github.com/zdohnal/pycups") (synopsis "Python bindings for libcups") (description |