diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/cups.scm | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
| download | guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/cups.scm')
| -rw-r--r-- | gnu/packages/cups.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index bbeb565657..230a36b23e 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -857,7 +857,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.10") + (version "1.7.11") ;; 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 @@ -865,11 +865,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/12/68/" - "34/82ca3e84f17410b5ec6818e5698524b1f42862cb/" - "epson-inkjet-printer-escpr-1.7.10-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/84/" + "42/69bb076469542fe702ada5ea53a4ea4773d407b0/" + "epson-inkjet-printer-escpr-1.7.11-1lsb3.2.tar.gz")) (sha256 - (base32 "0j31w85gbi2g3ad316vw7azns382m2di6wazdbiyv9vix5gvb60g")))) + (base32 "0m21qks68697x7k6z0i1c8lcf9l5ap4mwc5519a086cmy9whslzf")))) (build-system gnu-build-system) (arguments `(#:modules |