[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/25: gnu: hplip: Update to 3.22.10.
From: |
guix-commits |
Subject: |
15/25: gnu: hplip: Update to 3.22.10. |
Date: |
Sat, 15 Apr 2023 00:27:33 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 2a97bf3c50efb285038f84aba27631a06544348a
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Apr 14 23:03:58 2023 -0400
gnu: hplip: Update to 3.22.10.
* 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.
---
gnu/packages/cups.scm | 36 ++++++++----------------------------
1 file changed, 8 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 1a54156769..27363ae977 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -501,14 +501,14 @@ should only be used as part of the Guix cups-pk-helper
service.")
(define-public hplip
(package
(name "hplip")
- (version "3.22.4")
+ (version "3.22.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
- "0461pv3hgbmjxrz7y1kplnp1sp97hagzad7gc1qr2h5cqm3ybsbv"))
+ "09366v0x10l35bkda6s5ysh64qdf24givn2gxlyidr2kdcpkyg2k"))
(modules '((guix build utils)))
(snippet
'(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
;; drvs need to be merged).
(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"
(("'/usr/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")
bin target)))
(chmod file #o755)))
- (find-files "." (lambda (file stat)
- (eq? 'symlink (stat:type stat))))))))))))
+ (find-files "." (lambda (file stat)
+ (eq? 'symlink (stat:type
stat))))))))))))
;; Note that the error messages printed by the tools in the case of
;; 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
(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
(package/inherit hplip
(name "hplip-minimal")
- 03/25: maint: Merge sanity-check-next.py into sanity-check.py., (continued)
- 03/25: maint: Merge sanity-check-next.py into sanity-check.py., guix-commits, 2023/04/15
- 08/25: gnu: source-highlight: Inline skip-doc-directory phase., guix-commits, 2023/04/15
- 02/25: gnu: nss: Add which to to native inputs and use regular nspr., guix-commits, 2023/04/15
- 01/25: gnu: python-clickgen: Replace python-numpy-next with python-numpy., guix-commits, 2023/04/15
- 04/25: gnu: poppler-next: Delete variable., guix-commits, 2023/04/15
- 12/25: gnu: ruby-tzinfo-data: Remove #:guile argument in file-union call., guix-commits, 2023/04/15
- 19/25: gnu: hplip: Update to 3.23.3., guix-commits, 2023/04/15
- 21/25: gnu: python-jsonschema: Update to 4.5.1., guix-commits, 2023/04/15
- 13/25: gnu: valgrind/interactive: Rely on non-stripped glibc symbols., guix-commits, 2023/04/15
- 10/25: gnu: python-pluggy: Update to 1.0.0., guix-commits, 2023/04/15
- 15/25: gnu: hplip: Update to 3.22.10.,
guix-commits <=
- 17/25: gnu: hplip: Use gexps., guix-commits, 2023/04/15
- 20/25: gnu: iptables: Clean-up configure flags., guix-commits, 2023/04/15
- 22/25: gnu: libxkbcommon: Unconditionally add wayland to native-inputs., guix-commits, 2023/04/15
- 18/25: gnu: hplip: Remove input labels., guix-commits, 2023/04/15
- 06/25: gnu: ghc-9.2: Make the skip-T21694-i686 phase unconditional., guix-commits, 2023/04/15
- 07/25: gnu: openldap: Update to 2.6.3., guix-commits, 2023/04/15
- 11/25: gnu: wrap-python3: Replace assoc-ref call with gexp variable., guix-commits, 2023/04/15
- 14/25: gnu: python-pytest-7.1: Deprecate package., guix-commits, 2023/04/15
- 16/25: gnu: hplip: Re-order fields., guix-commits, 2023/04/15
- 23/25: gnu: libxkbcommon: Fix indentation., guix-commits, 2023/04/15