3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Commit graph

32 commits

Author SHA1 Message Date
Mark H Weaver
1a265842e6
gnu: Use PACKAGE/INHERIT in more places.
* gnu/packages/algebra.scm (fftwf, fftw-openmpi),
gnu/packages/audio.scm (ztoolkit-rsvg),
gnu/packages/bioinformatics.scm (python2-dendropy),
gnu/packages/boost.scm (boost-with-python2),
gnu/packages/check.scm (python2-mock, python2-pytest-mock),
gnu/packages/cups.scm (hplip-minimal),
gnu/packages/freedesktop.scm (libinput-minimal),
gnu/packages/gettext.scm (gnu-gettext),
gnu/packages/glib.scm (python2-pygobject),
gnu/packages/gnome.scm (gdl-minimal, libsoup-minimal, python2-pyatspi),
gnu/packages/groff.scm (groff-minimal),
gnu/packages/jami.scm (ffmpeg-jami),
gnu/packages/libcanberra.scm (libcanberra/gtk+-2),
gnu/packages/lirc.scm (python2-lirc),
gnu/packages/llvm.scm (clang-runtime-3.5),
gnu/packages/mpi.scm (java-openmpi, openmpi-thread-multiple),
gnu/packages/node.scm (libnode),
gnu/packages/onc-rpc.scm (libtirpc/hurd),
gnu/packages/python-compression.scm (bitshuffle-for-snappy),
gnu/packages/python-crypto.scm (python2-pycrypto, python2-cryptography)
(python2-cryptography, python2-m2crypto),
gnu/packages/python-web.scm (python2-html2text, python2-tornado)
(python2-terminado, python2-ndg-httpsclient, python2-websocket-client)
(python2-rauth, python2-url, python2-s3transfer),
gnu/packages/python-xyz.scm (python2-psutil, python2-serpent)
(python2-humanfriendly, python2-empy, python2-parse-type, python2-polib)
(python2-jsonschema, python2-pystache, python2-cython, python2-numpydoc)
(python2-ipyparallel, python2-traitlets, python2-dbus)
(python2-beautifulsoup4, python2-pep517, python2-flake8, python2-llfuse)
(python2-tlsh, python-file, python2-notebook, python-jupyter-console-minimal)
(python2-contextlib2, python2-promise, python2-anyjson, python2-amqp)
(python2-kombu, python2-billiard, python2-celery, python2-whoosh)
(python2-jellyfish, python-rope, ptpython-2, python2-binaryornot)
(python2-setproctitle, python2-argcomplete, python2-xopen, python2-isort)
(python2-radon, python2-rfc6555, python2-activepapers, python2-send2trash)
(python2-cloudpickle, python2-reparser),
gnu/packages/python.scm (python2-called-python),
gnu/packages/qt.scm (python2-sip, python-pyqt-without-qtwebkit, python2-pyqt)
(python-qscintilla, python-pyqt+qscintilla),
gnu/packages/scanner.scm (sane-backends),
gnu/packages/sdl.scm (guile3.0-sdl2),
gnu/packages/selinux.scm (checkpolicy, libselinux, libsemanage, secilc)
(python-sepolgen, policycoreutils),
gnu/packages/serialization.scm (lua5.1-libmpack, lua5.2-libmpack),
gnu/packages/simulation.scm (fenics),
gnu/packages/statistics.scm (python2-statsmodels),
gnu/packages/texinfo.scm (info-reader),
gnu/packages/wxwidgets.scm (wxwidgets-gtk2, wxwidgets-gtk2-3.1),
gnu/packages/xml.scm (xmlsec-nss),
gnu/packages/xorg.scm (uim-gtk, uim-qt),
guix/build-system/python.scm (package-with-explicit-python)
(strip-python2-variant): Use PACKAGE/INHERIT.
2021-03-17 03:58:10 -04:00
Ludovic Courtès
011ec41c25
gnu: Fix "license:" prefix in scanner.scm.
* gnu/packages/scanner.scm: Change "licence:" to "license:".
2021-02-22 12:08:32 +01:00
Tobias Geerinckx-Rice
78ce446b20
gnu: sane-backends-minimal: Update to 1.0.32.
* gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.32.
[arguments]: Adapt the ‘zap-unnecessary-git-dependency’ phase to the new
tools/git-version-gen script.
2021-02-15 17:23:55 +01:00
Tobias Geerinckx-Rice
cf9047b222
gnu: sane-backends-minimal: Remove obsolete #t return values.
* gnu/packages/scanner.scm (sane-backends-minimal)[source, arguments]:
Don't return #t from snippet or phases.
2021-02-15 17:23:55 +01:00
Tobias Geerinckx-Rice
902d76c839
gnu: sane-backends-minimal: Don't use unstable tarball.
* gnu/packages/scanner.scm (sane-backends-minimal)[source]: Use
GIT-FETCH and GIT-FILE-NAME.
[arguments]:
[native-inputs]: Add autoconf, autoconf-archive, automake,
gettext-minimal, libtool, and python-wrapper.
[arguments]: Add ‘zap-unnecessary-git-dependency’,
‘build-pixma_sane_options.c’, and ‘make-reproducible’ phases.
2021-02-15 17:23:55 +01:00
Tobias Geerinckx-Rice
509906c201
gnu: sane-backends-minimal: Update to 1.0.31.
* gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.31.
[inputs]: Add libxml2.
2020-08-23 18:19:59 +02:00
Tobias Geerinckx-Rice
ad14938327
gnu: sane-backends-minimal: Update to 1.0.30 [Epson security fixes].
Fixes CVE-2020-12867 (GHSL-2020-075), CVE-2020-12862 (GHSL-2020-082),
CVE-2020-12863 (GHSL-2020-083), CVE-2020-12865 (GHSL-2020-084), and
several other memory management bugs.

Mitigates CVE-2020-12866 (GHSL-2020-079), CVE-2020-12861 (GHSL-2020-080),
and CVE-2020-12864 (GHSL-2020-081).

* gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.30.
2020-05-17 16:04:48 +02:00
Marius Bakke
7edafc884c
Merge branch 'master' into core-updates 2020-02-14 19:05:45 +01:00
Leo Prikler
5f6ce90a90
gnu: sane-backends: Disable genesys_unit_tests.
Fixes <https://bugs.gnu.org/39449>.

* gnu/packages/scanner.scm (sane-backends)[arguments]<#:phases>:
Add disable-failing-backend-tests.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2020-02-13 23:32:19 +01:00
Marius Bakke
52665d2b6b
Merge branch 'staging' into core-updates 2020-02-03 15:45:44 +01:00
Tobias Geerinckx-Rice
127c519870
gnu: sane-backends-minimal: Update to 1.0.29.
* gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.29.
2020-02-02 22:14:34 +01:00
Marius Bakke
4bd428a7ce
gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'.
* gnu/packages/abiword.scm (abiword)[inputs]: Change from LIBJPEG to
LIBJPEG-TURBO.
* gnu/packages/admin.scm (testdisk)[inputs]: Likewise.
* gnu/packages/algebra.scm (giac)[inputs]: Likewise.
* gnu/packages/animation.scm (synfig)[inputs]: Likewise.
* gnu/packages/astronomy.scm (gnuastro, celestia)[inputs]: Likewise.
* gnu/packages/cdrom.scm (dvdstyler)[inputs]: Likewise.
* gnu/packages/cran.scm (r-jpeg, r-tiff, r-readbitmap)[inputs]: Likewise.
* gnu/packages/cups.scm (cups-filters, hplip)[inputs]: Likewise.
* gnu/packages/display-managers.scm (slim)[inputs]: Likewise.
* gnu/packages/ebook.scm (fbreader)[inputs]: Likewise.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise.
* gnu/packages/fltk.scm (fltk, ntk)[inputs]: Likewise.
* gnu/packages/fontutils.scm (fontforge)[inputs]: Likewise.
* gnu/packages/freedesktop.scm (weston)[inputs]: Likewise.
* gnu/packages/game-development.scm (sfml, allegro, aseprite, python-pygame,
eureka, ioquake3)[inputs]: Likewise.
* gnu/packages/games.scm (adanaxisgpl, freedroidrpg, irrlicht, minetest,
fizmo, supertuxkart, gzdoom, xmoto, xonotic)[inputs]: Likewise.
* gnu/packages/gd.scm (gd, perl-gd)[inputs]: Likewise.
* gnu/packages/ghostscript.scm (lcms)[inputs]: Likewise.
(ghostscript)[inputs, native-inputs]: Likewise.
* gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise.
* gnu/packages/gnome.scm (libgnomeui, eog, tracker-miners, gthumb)[inputs]: Likewise.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise.
* gnu/packages/gnustep.scm (windowmaker)[inputs]: Likewise.
* gnu/packages/graphics.scm (blender, blender-2.79, openimageio,
openscenegraph, openscenegraph-3.4, povray, fgallery)[inputs]: Likewise.
* gnu/packages/graphviz.scm (graphviz)[inputs]: Likewise.
* gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Likewise.
* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Likewise.
* gnu/packages/image-processing.scm (dcmtk, mia, vtk, opencv, vips, nip2, vxl,
insight-toolkit)[inputs]: Likewise.
* gnu/packages/image-viewers.scm (gpicview, luminance-hdr)[inputs]: Likewise.
* gnu/packages/image.scm (jpegoptim, libtiff, leptonica, imlib2, freeimage,
vigra, libwebp, libmng, jasper, steghide, jp2a)[inputs]: Likewise.
* gnu/packages/imagemagick.scm (imagemagick, graphicsmagick)[inputs]: Likewise.
* gnu/packages/java.scm (icedtea-6, icedtea-7, openjdk9, openjdk11,
openjdk12)[inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (khtml)[inputs]: Likewise.
* gnu/packages/kodi.scm (kodi)[inputs]: Likewise.
* gnu/packages/machine-learning.scm (dlib, tensorflow)[inputs]: Likewise.
* gnu/packages/mate.scm (atril, eom)[inputs]: Likewise.
* gnu/packages/maths.scm (hdf4, hdf-java, hdf-eos2, netcdf)[inputs]: Likewise.
* gnu/packages/netpbm.scm (netpbm)[inputs]: Likewise.
* gnu/packages/pdf.scm (zathura-pdf-mupdf, podofo, mupdf, fbida)[inputs]: Likewise.
* gnu/packages/photo.scm (libraw, libpano13, enblend-enfuse, darktable, hugin,
rawtherapee)[inputs]: Likewise.
* gnu/packages/prolog.scm (swi-prolog)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-hdf4, python-pillow)[inputs]: Likewise.
* gnu/packages/qt.scm (qtbase, qtwebkit)[inputs]: Likewise.
* gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise.
* gnu/packages/scanner.scm (sane-backends, xsane)[inputs]: Likewise.
* gnu/packages/scheme.scm (racket)[inputs]: Likewise.
* gnu/packages/scribus.scm (scribus)[inputs]: Likewise.
* gnu/packages/sdl.scm (sdl-image)[propagated-inputs]: Likewise.
(guile-sdl)[native-inputs]: Likewise.
* gnu/packages/spice.scm (spice-gtk)[inputs]: Likewise.
* gnu/packages/statistics.scm (r-with-tests)[inputs]: Likewise.
* gnu/packages/tcl.scm (perl-tk)[inputs]: Likewise.
* gnu/packages/upnp.scm (readymedia)[inputs]: Likewise.
* gnu/packages/video.scm (mplayer, mpv, v4l-utils, motion)[inputs]: Likewise.
* gnu/packages/web-browsers.scm (dillo, links)[inputs]: Likewise.
* gnu/packages/web.scm (netsurf)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk)[inputs]: Likewise.
* gnu/packages/wine.scm (wine)[inputs]: Likewise.
* gnu/packages/wv.scm (wv)[inputs]: Likewise.
* gnu/packages/wxwidgets.scm (wxwidgets, wxwidgets-2)[inputs]: Likewise.
* gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Likewise.
* gnu/packages/xfce.scm (tumbler)[inputs]: Likewise.
* gnu/packages/xfig.scm (xfig, transfig)[inputs]: Likewise.
* gnu/packages/xorg.scm (xpra)[inputs]: Likewise.
2020-01-22 22:12:34 +01:00
Tobias Geerinckx-Rice
99b106022c
gnu: xsane: Fix snprintf buffer length.
* gnu/packages/scanner.scm (xsane)[source]: Add patch.
* gnu/packages/patches/xsane-fix-snprintf-buffer-length.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2019-11-22 22:16:32 +01:00
Tobias Geerinckx-Rice
a608666d74
gnu: Add xsane.
* gnu/packages/scanner.scm (xsane): New public variable.
2019-11-22 22:01:40 +01:00
Tobias Geerinckx-Rice
a094693de3
gnu: sane-backends: Build back ends that need JPEG support.
* gnu/packages/scanner.scm (sane-backends)[inputs]: Add libjpeg.
2019-08-01 05:43:33 +02:00
Tobias Geerinckx-Rice
7018f926d4
gnu: sane-backends-minimal: Update to 1.0.28.
* gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.28.
[arguments]: Disable back end tests.
2019-08-01 05:34:56 +02:00
Tobias Geerinckx-Rice
21b9c6fade
Order (gnu packages scanner) module imports alphabetically.
* gnu/packages/scanner.scm (define-module): Order module imports
alphabetically.
2019-03-18 15:05:09 +01:00
Tobias Geerinckx-Rice
6845ab5204
gnu: Import (gnu packages image) in (gnu packages scanner).
This is a follow-up to commit 10bd2889d2.

* gnu/packages/scanner.scm: #:use-module (gnu packages image).
2019-03-10 17:12:16 +01:00
Tobias Geerinckx-Rice
10bd2889d2
gnu: sane-backends: Support PNG scanimage output.
* gnu/packages/scanner.scm (sane-backends)[inputs]: Add libpng.
2019-03-10 16:33:55 +01:00
Tobias Geerinckx-Rice
abe6e670d3
gnu: sane-backends-minimal: Fix USB support.
* gnu/packages/scanner.scm (sane-backends-minimal)[inputs]: Replace
libusb-compat with libusb.
[arguments]: Disable tests that require USB access.
2019-03-07 02:13:26 +01:00
8e1895964f
gnu: Add hplip-minimal.
* gnu/packages/cups.scm (hplip-minimal): New variable.
* gnu/packages/scanner.scm (sane-backends)[inputs]: Replace hplip with
hplip-minimal.
* doc/guix.texi (Printing Services): Change example code to use
hplip-minimal in place of hplip. Add note explaining when use hplip.
2018-07-25 11:52:59 +03:00
Mark H Weaver
372947725a
gnu: sane-backends-minimal: Return #t from all phases.
* gnu/packages/scanner.scm (sane-backends-minimal)[arguments]: Return #t from
the 'install-udev-rules' phase.
2018-04-12 04:02:40 -04:00
Mark H Weaver
6cbee49d66
gnu: All snippets report errors using exceptions, else return #t.
* gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm,
gnu/packages/backup.scm, gnu/packages/base.scm,
gnu/packages/bioinformatics.scm, gnu/packages/cdrom.scm,
gnu/packages/chez.scm, gnu/packages/code.scm, gnu/packages/compression.scm,
gnu/packages/cross-base.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm,
gnu/packages/databases.scm, gnu/packages/dns.scm, gnu/packages/emacs.scm,
gnu/packages/emulators.scm, gnu/packages/engineering.scm,
gnu/packages/enlightenment.scm, gnu/packages/fpga.scm,
gnu/packages/freedesktop.scm, gnu/packages/ftp.scm, gnu/packages/games.scm,
gnu/packages/gcc.scm, gnu/packages/geo.scm, gnu/packages/ghostscript.scm,
gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm,
gnu/packages/gnuzilla.scm, gnu/packages/graphics.scm, gnu/packages/gtk.scm,
gnu/packages/guile.scm, gnu/packages/irc.scm, gnu/packages/java.scm,
gnu/packages/kerberos.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm,
gnu/packages/lxde.scm, gnu/packages/machine-learning.scm,
gnu/packages/mail.scm, gnu/packages/maths.scm, gnu/packages/messaging.scm,
gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/music.scm,
gnu/packages/netpbm.scm, gnu/packages/networking.scm, gnu/packages/node.scm,
gnu/packages/nvi.scm, gnu/packages/ocaml.scm, gnu/packages/pdf.scm,
gnu/packages/perl.scm, gnu/packages/php.scm, gnu/packages/plotutils.scm,
gnu/packages/pretty-print.scm, gnu/packages/profiling.scm,
gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/robotics.scm,
gnu/packages/sawfish.scm, gnu/packages/scanner.scm, gnu/packages/scheme.scm,
gnu/packages/scribus.scm, gnu/packages/sdl.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/slang.scm, gnu/packages/smalltalk.scm, gnu/packages/ssh.scm,
gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/tbb.scm,
gnu/packages/terminals.scm, gnu/packages/texinfo.scm,
gnu/packages/text-editors.scm, gnu/packages/textutils.scm,
gnu/packages/tls.scm, gnu/packages/unrtf.scm,
gnu/packages/version-control.scm, gnu/packages/video.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wm.scm,
gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm:
In all snippets, report errors using exceptions, or else return #t.
2018-03-16 09:08:31 -04:00
Tobias Geerinckx-Rice
4ed390a0e7
gnu: sane-backends-minimal: Run most tests.
* gnu/packages/scanner.scm (sane-backends-minimal)[arguments]: Add a
‘disable-failing-tests’ phase to do just that, and run the rest.
2017-05-24 22:54:39 +02:00
Tobias Geerinckx-Rice
4febd4b0f4
gnu: sane-backends-minimal, sane-backends: Update to 1.0.27.
* gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.27.
[source]: Use (what should be) a more stable download URI.
2017-05-24 22:54:39 +02:00
Ludovic Courtès
a32d0c8304
gnu: sane-backends: Remove timestamps from the output.
* gnu/packages/scanner.scm (sane-backends-minimal)[source](modules, snippet):
New fields.
2016-12-17 23:13:05 +01:00
Andy Patterson
4c92874328
gnu: Add and use sane-backends.
* gnu/packages/scanner.scm (sane-backends): New variable.
* gnu/packages/gnome.scm (colord, simple-scan): Use it instead of
'sane-backends-minimal'.
* gnu/packages/libreoffice.scm (libreoffice): Likewise.
* gnu/packages/wine.scm (wine): Likewise.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2016-12-17 23:13:05 +01:00
Andy Patterson
32aa37a2e7
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>
2016-12-17 23:13:04 +01:00
Andy Patterson
33a14e29f9
gnu: sane-backends: Disable backend generation.
* gnu/packages/scanner.scm (sane-backends)[arguments]: Add a phase to
disable the compilation of backends.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2016-12-17 23:13:04 +01:00
Al McElrath
d976eccd26
gnu: sane-backends: Update to 1.0.25.
* gnu/packages/scanner.scm (sane-backends): Update to 1.0.25.

Signed-off-by: Leo Famulari <leo@famulari.name>
2016-10-09 17:50:28 -04:00
Andy Wingo
3b71b36c08 gnu: sane-backends: Support USB scanners.
* gnu/packages/scanner.scm (sane-backends): Build with libusb-compat as an
  input and install a udev rule to give users access to scanners.

Modified-By: Mark H Weaver <mhw@netris.org>
2015-08-08 14:09:56 -04:00
John Darrington
45c151d9b4 gnu: Add sane-backends
* gnu/packages/scanner.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
2014-10-20 18:13:36 +02:00