amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: hplip: Update to 3.22.10.

Browse source 
* gnu/packages/cups.scm (hplip): Update to 3.22.10.
[arguments]: Absorb the fix-more-hard-coded-file-names phase from hplip-next
into the fix-hard-coded-file-names phase.
(hplip-next): Delete variable.
This commit is contained in:
Maxim Cournoyer 2023-04-14 23:03:58 -04:00
parent 802a3b7ba3
commit 2a97bf3c50
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 8 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/cups.scm
View file

@ -501,14 +501,14 @@ should only be used as part of the Guix cups-pk-helper service.")
(define-public hplip (define-public hplip
(package (package
(name "hplip") (name "hplip")
(version "3.22.4") (version "3.22.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version (uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz")) "/hplip-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0461pv3hgbmjxrz7y1kplnp1sp97hagzad7gc1qr2h5cqm3ybsbv")) "09366v0x10l35bkda6s5ysh64qdf24givn2gxlyidr2kdcpkyg2k"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -591,6 +591,10 @@ should only be used as part of the Guix cups-pk-helper service.")
;; FIXME: use merged ppds (I think actually only ;; FIXME: use merged ppds (I think actually only
;; drvs need to be merged). ;; drvs need to be merged).
(cupsdir (assoc-ref inputs "cups-minimal"))) (cupsdir (assoc-ref inputs "cups-minimal")))
(substitute* (find-files "." "\\.py$")
;; Refer to the correct default configuration file name.
(("/etc/hp/hplip.conf")
(string-append out "/etc/hp/hplip.conf")))
(substitute* "base/g.py" (substitute* "base/g.py"
(("'/usr/share;[^']*'") (("'/usr/share;[^']*'")
(string-append "'" cupsdir "/share'")) (string-append "'" cupsdir "/share'"))
@ -670,8 +674,8 @@ should only be used as part of the Guix cups-pk-helper service.")
(getenv "GUIX_PYTHONPATH") (getenv "GUIX_PYTHONPATH")
bin target))) bin target)))
(chmod file #o755))) (chmod file #o755)))
(find-files "." (lambda (file stat) (find-files "." (lambda (file stat)
(eq? 'symlink (stat:type stat)))))))))))) (eq? 'symlink (stat:type stat))))))))))))
;; Note that the error messages printed by the tools in the case of ;; Note that the error messages printed by the tools in the case of
;; missing dependencies are often downright misleading. ;; missing dependencies are often downright misleading.
@ -693,30 +697,6 @@ should only be used as part of the Guix cups-pk-helper service.")
(native-inputs (native-inputs
(list perl pkg-config)))) (list perl pkg-config))))
;;; TODO: Integrate in base hplip package on core-updates.
(define-public hplip-next
(package
(inherit hplip)
(name "hplip")
(version "3.22.10")
(source (origin
(inherit (package-source hplip))
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
"09366v0x10l35bkda6s5ysh64qdf24givn2gxlyidr2kdcpkyg2k"))))
(arguments
(substitute-keyword-arguments (package-arguments hplip)
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'fix-more-hard-coded-file-names
(lambda* (#:key outputs #:allow-other-keys)
(substitute* (find-files "." "\\.py$")
(("/etc/hp/hplip.conf")
(string-append (assoc-ref outputs "out")
"/etc/hp/hplip.conf")))))))))))
(define-public hplip-minimal (define-public hplip-minimal
(package/inherit hplip (package/inherit hplip
(name "hplip-minimal") (name "hplip-minimal")