gnu: Add and use sane-backends-minimal.

* gnu/packages/scanner.scm (sane-backends): Rename to...
(sane-backends-minimal): this. Adjust name, source, synopsis and
description accordingly.
* gnu/packages/cups.scm (hplip): Use 'sane-backends-minimal' instead of
'sane-backends'.
* gnu/packages/gnome.scm (colord, simple-scan): Likewise.
* gnu/packages/libreoffice.scm (libreoffice): Likewise.
* gnu/packages/wine.scm (wine): Likewise.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Andy Patterson 2016-12-14 00:03:24 -05:00 committed by Ludovic Courtès
parent 33a14e29f9
commit 32aa37a2e7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
5 changed files with 11 additions and 10 deletions

View File

@ -416,7 +416,7 @@ device-specific programs to convert and print many types of files.")
(inputs `(("libjpeg" ,libjpeg) (inputs `(("libjpeg" ,libjpeg)
("cups-minimal" ,cups-minimal) ("cups-minimal" ,cups-minimal)
("libusb" ,libusb) ("libusb" ,libusb)
("sane-backends" ,sane-backends) ("sane-backends" ,sane-backends-minimal)
("dbus" ,dbus) ("dbus" ,dbus)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("python" ,python) ("python" ,python)

View File

@ -2433,7 +2433,7 @@ keyboard shortcuts.")
("libusb" ,libusb) ("libusb" ,libusb)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("polkit" ,polkit) ("polkit" ,polkit)
("sane-backends" ,sane-backends))) ("sane-backends" ,sane-backends-minimal)))
(home-page "http://www.freedesktop.org/software/colord/") (home-page "http://www.freedesktop.org/software/colord/")
(synopsis "Color management service") (synopsis "Color management service")
(description "Colord is a system service that makes it easy to manage, (description "Colord is a system service that makes it easy to manage,
@ -3570,7 +3570,7 @@ USB transfers with your high-level application or system daemon.")
("cairo" ,cairo) ("cairo" ,cairo)
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf)
("gusb" ,gusb) ("gusb" ,gusb)
("libsane" ,sane-backends))) ("libsane" ,sane-backends-minimal)))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
("itstool" ,itstool) ("itstool" ,itstool)

View File

@ -784,7 +784,7 @@ and to return information on pronunciations, meanings and synonyms.")
("postgresql" ,postgresql) ("postgresql" ,postgresql)
("python" ,python) ("python" ,python)
("redland" ,redland) ("redland" ,redland)
("sane-backends" ,sane-backends) ("sane-backends" ,sane-backends-minimal)
("unixodbc" ,unixodbc) ("unixodbc" ,unixodbc)
("unzip" ,unzip) ("unzip" ,unzip)
("vigra" ,vigra) ("vigra" ,vigra)

View File

@ -26,15 +26,15 @@
#:use-module ((guix licenses) #:use-module ((guix licenses)
#:prefix licence:)) #:prefix licence:))
(define-public sane-backends (define-public sane-backends-minimal
(package (package
(name "sane-backends") (name "sane-backends-minimal")
(version "1.0.25") (version "1.0.25")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://alioth.debian.org/frs/download.php/file/4146/" "https://alioth.debian.org/frs/download.php/file/4146/"
name "-" version ".tar.gz")) "sane-backends-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4")))) "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4"))))
@ -71,9 +71,10 @@
;; **** File generated for html-backends-split mode is different from reference ;; **** File generated for html-backends-split mode is different from reference
;; Makefile:501: recipe for target 'check.local' failed ;; Makefile:501: recipe for target 'check.local' failed
(home-page "http://www.sane-project.org") (home-page "http://www.sane-project.org")
(synopsis "Raster image scanner library and drivers") (synopsis
"Raster image scanner library and drivers, without scanner support")
(description "SANE stands for \"Scanner Access Now Easy\" and is an API (description "SANE stands for \"Scanner Access Now Easy\" and is an API
proving access to any raster image scanner hardware (flatbed scanner, proving access to any raster image scanner hardware (flatbed scanner,
hand-held scanner, video- and still-cameras, frame-grabbers, etc.). The hand-held scanner, video- and still-cameras, frame-grabbers, etc.). The
package contains the library and drivers.") package contains the library, but no drivers.")
(license licence:gpl2+))) ; plus linking exception (license licence:gpl2+))) ; plus linking exception

View File

@ -83,7 +83,7 @@
("libmpg123" ,mpg123) ("libmpg123" ,mpg123)
("libldap" ,openldap) ("libldap" ,openldap)
("libnetapi" ,samba) ("libnetapi" ,samba)
("libsane" ,sane-backends) ("libsane" ,sane-backends-minimal)
("libpng" ,libpng) ("libpng" ,libpng)
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
("libtiff" ,libtiff) ("libtiff" ,libtiff)