mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: sane-backends-minimal: Rename to sane.
sane-backends-minimal contains helper programs and library files, but none of the backends. Renaming the package to avoid confusion. * gnu/packages/scanner.scm (sane-backends-minimal): Rename to... (sane): ... this. (utsushi, hplip, hplip-minimal)[inputs]: Replace sane-backends-minimal with sane. Change-Id: If987248f0ad8ac7041454a164d905c1c069242b7
This commit is contained in:
parent
d186087f96
commit
9f1105ec50
2 changed files with 10 additions and 8 deletions
|
@ -752,7 +752,7 @@ should only be used as part of the Guix cups-pk-helper service.")
|
|||
python-pygobject
|
||||
python-pyqt
|
||||
python-wrapper
|
||||
sane-backends-minimal
|
||||
sane
|
||||
net-snmp
|
||||
openssl
|
||||
avahi
|
||||
|
@ -790,7 +790,7 @@ should only be used as part of the Guix cups-pk-helper service.")
|
|||
dbus
|
||||
libjpeg-turbo
|
||||
libusb
|
||||
sane-backends-minimal
|
||||
sane
|
||||
zlib))
|
||||
(synopsis "GUI-less version of hplip")))
|
||||
|
||||
|
|
|
@ -42,6 +42,7 @@
|
|||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix gexp)
|
||||
|
@ -104,9 +105,10 @@ both WSD and eSCL.")
|
|||
(license (list license:gpl2+ ; the combined work
|
||||
license:expat)))) ; http_parser.[ch]
|
||||
|
||||
(define-public sane-backends-minimal
|
||||
(define-deprecated/public-alias sane-backends-minimal sane)
|
||||
(define-public sane
|
||||
(package
|
||||
(name "sane-backends-minimal")
|
||||
(name "sane")
|
||||
(version "1.3.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
|
@ -226,16 +228,16 @@ package contains the library, but no drivers.")
|
|||
;; support for HP scanners whose backends are not maintained by the SANE
|
||||
;; project, and builds all of those backends.
|
||||
(define-public sane-backends
|
||||
(package/inherit sane-backends-minimal
|
||||
(package/inherit sane
|
||||
(name "sane-backends")
|
||||
(inputs
|
||||
`(("hplip" ,(@ (gnu packages cups) hplip))
|
||||
("libjpeg" ,libjpeg-turbo) ; for pixma/epsonds/other back ends
|
||||
("libpng" ,libpng) ; support ‘scanimage --format=png’
|
||||
("libxml2" ,libxml2) ; for pixma back end
|
||||
,@(package-inputs sane-backends-minimal)))
|
||||
,@(package-inputs sane)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments sane-backends-minimal)
|
||||
(substitute-keyword-arguments (package-arguments sane)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'disable-backends)
|
||||
|
@ -304,7 +306,7 @@ package contains the library and drivers.")))
|
|||
"/lib/udev/rules.d")))))))
|
||||
(inputs (list boost
|
||||
eudev
|
||||
sane-backends-minimal
|
||||
sane
|
||||
libusb
|
||||
libjpeg-turbo
|
||||
imagemagick
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue