Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2020-01-03 19:41:05 +01:00
commit 982eff9e84
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
198 changed files with 16909 additions and 45796 deletions

View file

@ -420,14 +420,14 @@ should only be used as part of the Guix cups-pk-helper service.")
(define-public hplip
(package
(name "hplip")
(version "3.19.11")
(version "3.19.12")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
"0lfmym225dr4qnssglqd0gyf0nmm7jpbzkdr1s2wyknmx8z7fx9x"))
"0mdj0sqgfxjqa550adiw1gn4z9n6wcvn55slivgf0ndn5x89iwxp"))
(modules '((guix build utils)))
(patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet