From 185e8ac8cc52669fe1a94954f2a944abd3dde2f5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Feb 2023 15:55:10 -0500 Subject: gnu: Add hplip-next. * gnu/packages/cups.scm (hplip-next): New variable. --- gnu/packages/cups.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index c729363fe8..259805b98a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Mark H Weaver ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -696,6 +696,33 @@ 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.21.10") + (source (origin + (inherit (package-source hplip)) + (uri (string-append "mirror://sourceforge/hplip/hplip/" version + "/hplip-" version ".tar.gz")) + (sha256 + (base32 + "0q3adcp8iygravp4bq4gw14jk20c5rhnawj1333qyw8yvlghw8yy")))) + (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) + ;; Set the encoding to ISO-8859-1, as not all the files are + ;; readable as UTF-8. + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* (find-files ".") + (("/etc/hp/hplip.conf") + (string-append (assoc-ref outputs "out") + "/etc/hp/hplip.conf")))))))))))) + (define-public hplip-minimal (package/inherit hplip (name "hplip-minimal") -- cgit 1.4.1 From 037c1b254a84d656b87b6bbb9c339bc04cfdb0a8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 18 Feb 2023 16:01:10 -0500 Subject: gnu: hplip-next: Update to 3.22.10. * gnu/packages/cups.scm (hplip-next): Update to 3.22.10. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 259805b98a..f1007ea03b 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -701,14 +701,14 @@ should only be used as part of the Guix cups-pk-helper service.") (package (inherit hplip) (name "hplip") - (version "3.21.10") + (version "3.22.10") (source (origin (inherit (package-source hplip)) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0q3adcp8iygravp4bq4gw14jk20c5rhnawj1333qyw8yvlghw8yy")))) + "09366v0x10l35bkda6s5ysh64qdf24givn2gxlyidr2kdcpkyg2k")))) (arguments (substitute-keyword-arguments (package-arguments hplip) ((#:phases phases) -- cgit 1.4.1 From 636b771536b95d15a2fd68b468deeebac97d6bee Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 19 Feb 2023 09:14:17 -0500 Subject: gnu: hplip-next: Simplify the fix-more-hard-coded-file-names phase. * gnu/packages/cups.scm (hplip-next) [phases]: Only substitute python files in the fix-more-hard-coded-file-names phase. This greatly reduce the time taken by the phase (from 21 s to 0.4 s) on my system, and is functionally equivalent. --- gnu/packages/cups.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index f1007ea03b..08677d612a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -715,13 +715,10 @@ should only be used as part of the Guix cups-pk-helper service.") #~(modify-phases #$phases (add-after 'unpack 'fix-more-hard-coded-file-names (lambda* (#:key outputs #:allow-other-keys) - ;; Set the encoding to ISO-8859-1, as not all the files are - ;; readable as UTF-8. - (with-fluids ((%default-port-encoding "ISO-8859-1")) - (substitute* (find-files ".") - (("/etc/hp/hplip.conf") - (string-append (assoc-ref outputs "out") - "/etc/hp/hplip.conf")))))))))))) + (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 -- cgit 1.4.1 From 00d855ae3aa8a5023e1181e94c9dadde1d4da6c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 12 Feb 2023 01:00:01 +0100 Subject: gnu: epson-inkjet-printer-escpr: Update to 1.7.24. * gnu/packages/cups.scm (epson-inkjet-printer-escpr): Update to 1.7.24. --- gnu/packages/cups.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 08677d612a..ba500d433e 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -895,7 +895,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (define-public epson-inkjet-printer-escpr (package (name "epson-inkjet-printer-escpr") - (version "1.7.22") + (version "1.7.24") ;; XXX: This currently works. But it will break as soon as a newer ;; version is available since the URLs for older versions are not ;; preserved. An alternative source will be added as soon as @@ -903,11 +903,11 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (source (origin (method url-fetch) - (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/96/" - "55/c6fced63098ae1ba104f11f572794fd558ffca29/" - "epson-inkjet-printer-escpr-1.7.22-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/14/31/" + "90/d2f5b28fcfaa0a1d1753eac5703aa5d88004ce06/" + "epson-inkjet-printer-escpr-1.7.24-1lsb3.2.tar.gz")) (sha256 - (base32 "0b359krhhjjw5hc4b0gqdqwrm6dzc263mdccfzgnyyq7znkyybqb")))) + (base32 "0bwff3p6d0xgghf3bicylbxkv9vxz3gjjbr0iafyxz23kalzz9qj")))) (build-system gnu-build-system) (arguments (list #:modules -- cgit 1.4.1