amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sane-backends-minimal: Rename to sane.

Browse source 
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:
Sergey Trofimov 2025-06-18 11:23:20 +02:00 • committed by John Kehayias
parent d186087f96
commit 9f1105ec50
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/cups.scm
View file

@ -752,7 +752,7 @@ should only be used as part of the Guix cups-pk-helper service.")
python-pygobject python-pygobject
python-pyqt python-pyqt
python-wrapper python-wrapper
sane-backends-minimal sane
net-snmp net-snmp
openssl openssl
avahi avahi
@ -790,7 +790,7 @@ should only be used as part of the Guix cups-pk-helper service.")
dbus dbus
libjpeg-turbo libjpeg-turbo
libusb libusb
sane-backends-minimal sane
zlib)) zlib))
(synopsis "GUI-less version of hplip"))) (synopsis "GUI-less version of hplip")))

14
gnu/packages/scanner.scm
View file

@ -42,6 +42,7 @@
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix deprecation)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix gexp) #:use-module (guix gexp)
@ -104,9 +105,10 @@ both WSD and eSCL.")
(license (list license:gpl2+ ; the combined work (license (list license:gpl2+ ; the combined work
license:expat)))) ; http_parser.[ch] license:expat)))) ; http_parser.[ch]
(define-public sane-backends-minimal (define-deprecated/public-alias sane-backends-minimal sane)
(define-public sane
(package (package
(name "sane-backends-minimal") (name "sane")
(version "1.3.1") (version "1.3.1")
(source (origin (source (origin
(method git-fetch) (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 ;; support for HP scanners whose backends are not maintained by the SANE
;; project, and builds all of those backends. ;; project, and builds all of those backends.
(define-public sane-backends (define-public sane-backends
(package/inherit sane-backends-minimal (package/inherit sane
(name "sane-backends") (name "sane-backends")
(inputs (inputs
`(("hplip" ,(@ (gnu packages cups) hplip)) `(("hplip" ,(@ (gnu packages cups) hplip))
("libjpeg" ,libjpeg-turbo) ; for pixma/epsonds/other back ends ("libjpeg" ,libjpeg-turbo) ; for pixma/epsonds/other back ends
("libpng" ,libpng) ; support ‘scanimage --format=png’ ("libpng" ,libpng) ; support ‘scanimage --format=png’
("libxml2" ,libxml2) ; for pixma back end ("libxml2" ,libxml2) ; for pixma back end
,@(package-inputs sane-backends-minimal))) ,@(package-inputs sane)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments sane-backends-minimal) (substitute-keyword-arguments (package-arguments sane)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(delete 'disable-backends) (delete 'disable-backends)
@ -304,7 +306,7 @@ package contains the library and drivers.")))
"/lib/udev/rules.d"))))))) "/lib/udev/rules.d")))))))
(inputs (list boost (inputs (list boost
eudev eudev
sane-backends-minimal sane
libusb libusb
libjpeg-turbo libjpeg-turbo
imagemagick imagemagick