You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

881 lines
34 KiB

gnu: Separate Python core packages from the rest. * gnu/packages/python.scm: Move hundreds of package definitions from here... * gnu/packages/python-xyz.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/audio.scm, gnu/packages/backup.scm, gnu/packages/benchmark.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/calendar.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/cluster.scm, gnu/packages/compression.scm, gnu/packages/connman.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm, gnu/packages/databases.scm, gnu/packages/dav.scm, gnu/packages/direct-connect.scm, gnu/packages/disk.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/docker.scm, gnu/packages/ebook.scm, gnu/packages/elf.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/enlightenment.scm, gnu/packages/finance.scm, gnu/packages/fltk.scm, gnu/packages/fontutils.scm, gnu/packages/freedesktop.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/geo.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/gtk.scm, gnu/packages/ham-radio.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/kde-frameworks.scm, gnu/packages/key-mon.scm, gnu/packages/libffi.scm, gnu/packages/libreoffice.scm, gnu/packages/libusb.scm, gnu/packages/lirc.scm, gnu/packages/logging.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/medical.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/nutrition.scm, gnu/packages/openldap.scm, gnu/packages/openstack.scm, gnu/packages/package-management.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/photo.scm, gnu/packages/polkit.scm, gnu/packages/protobuf.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/qt.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm, gnu/packages/search.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/simulation.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/sync.scm, gnu/packages/terminals.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/tryton.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/virtualization.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wicd.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm: Update module references.
3 years ago
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.
2 years ago
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.
2 years ago
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.
2 years ago
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.
2 years ago
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.
2 years ago
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.
2 years ago
gnu: Remove ".git" from "https://github/…/….git". Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix swh) would sometimes return #f for these because the ".git" URLs are redirects to the non-".git" URLs. Consequently, 'guix lint -c archival' would keep saying "scheduled Software Heritage archival"; likewise, the fallback download code would fail. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm, gnu/packages/android.scm, gnu/packages/animation.scm, gnu/packages/arcan.scm, gnu/packages/assembly.scm, gnu/packages/audio.scm, gnu/packages/authentication.scm, gnu/packages/avr.scm, gnu/packages/axoloti.scm, gnu/packages/backup.scm, gnu/packages/bash.scm, gnu/packages/benchmark.scm, gnu/packages/bioconductor.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/boost.scm, gnu/packages/build-tools.scm, gnu/packages/c.scm, gnu/packages/calendar.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/chez.scm, gnu/packages/clojure.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/compton.scm, gnu/packages/coq.scm, gnu/packages/cpp.scm, gnu/packages/cran.scm, gnu/packages/crypto.scm, gnu/packages/curl.scm, gnu/packages/databases.scm, gnu/packages/datastructures.scm, gnu/packages/debug.scm, gnu/packages/disk.scm, gnu/packages/distributed.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/dns.scm, gnu/packages/docker.scm, gnu/packages/education.scm, gnu/packages/efi.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/embedded.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/erlang.scm, gnu/packages/fabric-management.scm, gnu/packages/file-systems.scm, gnu/packages/finance.scm, gnu/packages/firmware.scm, gnu/packages/flashing-tools.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/fpga.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/genealogy.scm, gnu/packages/genimage.scm, gnu/packages/geo.scm, gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/gnome-xyz.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/golang.scm, gnu/packages/gpodder.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/groff.scm, gnu/packages/groovy.scm, gnu/packages/gtk.scm, gnu/packages/guile-xyz.scm, gnu/packages/guile.scm, gnu/packages/hardware.scm, gnu/packages/haskell-apps.scm, gnu/packages/haskell-xyz.scm, gnu/packages/hexedit.scm, gnu/packages/i2p.scm, gnu/packages/ibus.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/ipfs.scm, gnu/packages/java-graphics.scm, gnu/packages/java-maths.scm, gnu/packages/java.scm, gnu/packages/javascript.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/jupyter.scm, gnu/packages/kodi.scm, gnu/packages/language.scm, gnu/packages/lego.scm, gnu/packages/less.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm, gnu/packages/lirc.scm, gnu/packages/lisp-xyz.scm, gnu/packages/llvm.scm, gnu/packages/logging.scm, gnu/packages/lolcode.scm, gnu/packages/lua.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/maths.scm, gnu/packages/maven.scm, gnu/packages/mes.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/node-xyz.scm, gnu/packages/ocaml.scm, gnu/packages/ocr.scm, gnu/packages/onc-rpc.scm, gnu/packages/opencl.scm, gnu/packages/opencog.scm, gnu/packages/pantheon.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/perl6.scm, gnu/packages/phabricator.scm, gnu/packages/popt.scm, gnu/packages/printers.scm, gnu/packages/prolog.scm, gnu/packages/protobuf.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/qt.scm, gnu/packages/radio.scm, gnu/packages/rails.scm, gnu/packages/rdf.scm, gnu/packages/rednotebook.scm, gnu/packages/rpc.scm, gnu/packages/rsync.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/screen.scm, gnu/packages/security-token.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/shellutils.scm, gnu/packages/simh.scm, gnu/packages/sml.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/stenography.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/synergy.scm, gnu/packages/telephony.scm, gnu/packages/terminals.scm, gnu/packages/tex.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tmux.scm, gnu/packages/tor.scm, gnu/packages/toys.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/virtualization.scm, gnu/packages/vlang.scm, gnu/packages/vnc.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wireservice.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
1 year ago
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.
2 years ago
gnu: Remove ".git" from "https://github/…/….git". Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix swh) would sometimes return #f for these because the ".git" URLs are redirects to the non-".git" URLs. Consequently, 'guix lint -c archival' would keep saying "scheduled Software Heritage archival"; likewise, the fallback download code would fail. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm, gnu/packages/android.scm, gnu/packages/animation.scm, gnu/packages/arcan.scm, gnu/packages/assembly.scm, gnu/packages/audio.scm, gnu/packages/authentication.scm, gnu/packages/avr.scm, gnu/packages/axoloti.scm, gnu/packages/backup.scm, gnu/packages/bash.scm, gnu/packages/benchmark.scm, gnu/packages/bioconductor.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/boost.scm, gnu/packages/build-tools.scm, gnu/packages/c.scm, gnu/packages/calendar.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/chez.scm, gnu/packages/clojure.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/compton.scm, gnu/packages/coq.scm, gnu/packages/cpp.scm, gnu/packages/cran.scm, gnu/packages/crypto.scm, gnu/packages/curl.scm, gnu/packages/databases.scm, gnu/packages/datastructures.scm, gnu/packages/debug.scm, gnu/packages/disk.scm, gnu/packages/distributed.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/dns.scm, gnu/packages/docker.scm, gnu/packages/education.scm, gnu/packages/efi.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/embedded.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/erlang.scm, gnu/packages/fabric-management.scm, gnu/packages/file-systems.scm, gnu/packages/finance.scm, gnu/packages/firmware.scm, gnu/packages/flashing-tools.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/fpga.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/genealogy.scm, gnu/packages/genimage.scm, gnu/packages/geo.scm, gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/gnome-xyz.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/golang.scm, gnu/packages/gpodder.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/groff.scm, gnu/packages/groovy.scm, gnu/packages/gtk.scm, gnu/packages/guile-xyz.scm, gnu/packages/guile.scm, gnu/packages/hardware.scm, gnu/packages/haskell-apps.scm, gnu/packages/haskell-xyz.scm, gnu/packages/hexedit.scm, gnu/packages/i2p.scm, gnu/packages/ibus.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/ipfs.scm, gnu/packages/java-graphics.scm, gnu/packages/java-maths.scm, gnu/packages/java.scm, gnu/packages/javascript.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/jupyter.scm, gnu/packages/kodi.scm, gnu/packages/language.scm, gnu/packages/lego.scm, gnu/packages/less.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm, gnu/packages/lirc.scm, gnu/packages/lisp-xyz.scm, gnu/packages/llvm.scm, gnu/packages/logging.scm, gnu/packages/lolcode.scm, gnu/packages/lua.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/maths.scm, gnu/packages/maven.scm, gnu/packages/mes.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/node-xyz.scm, gnu/packages/ocaml.scm, gnu/packages/ocr.scm, gnu/packages/onc-rpc.scm, gnu/packages/opencl.scm, gnu/packages/opencog.scm, gnu/packages/pantheon.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/perl6.scm, gnu/packages/phabricator.scm, gnu/packages/popt.scm, gnu/packages/printers.scm, gnu/packages/prolog.scm, gnu/packages/protobuf.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/qt.scm, gnu/packages/radio.scm, gnu/packages/rails.scm, gnu/packages/rdf.scm, gnu/packages/rednotebook.scm, gnu/packages/rpc.scm, gnu/packages/rsync.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/screen.scm, gnu/packages/security-token.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/shellutils.scm, gnu/packages/simh.scm, gnu/packages/sml.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/stenography.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/synergy.scm, gnu/packages/telephony.scm, gnu/packages/terminals.scm, gnu/packages/tex.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tmux.scm, gnu/packages/tor.scm, gnu/packages/toys.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/virtualization.scm, gnu/packages/vlang.scm, gnu/packages/vnc.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wireservice.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
1 year ago
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.
2 years ago
2 years ago
gnu: Remove ".git" from "https://github/…/….git". Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix swh) would sometimes return #f for these because the ".git" URLs are redirects to the non-".git" URLs. Consequently, 'guix lint -c archival' would keep saying "scheduled Software Heritage archival"; likewise, the fallback download code would fail. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm, gnu/packages/android.scm, gnu/packages/animation.scm, gnu/packages/arcan.scm, gnu/packages/assembly.scm, gnu/packages/audio.scm, gnu/packages/authentication.scm, gnu/packages/avr.scm, gnu/packages/axoloti.scm, gnu/packages/backup.scm, gnu/packages/bash.scm, gnu/packages/benchmark.scm, gnu/packages/bioconductor.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/boost.scm, gnu/packages/build-tools.scm, gnu/packages/c.scm, gnu/packages/calendar.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/chez.scm, gnu/packages/clojure.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/compton.scm, gnu/packages/coq.scm, gnu/packages/cpp.scm, gnu/packages/cran.scm, gnu/packages/crypto.scm, gnu/packages/curl.scm, gnu/packages/databases.scm, gnu/packages/datastructures.scm, gnu/packages/debug.scm, gnu/packages/disk.scm, gnu/packages/distributed.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/dns.scm, gnu/packages/docker.scm, gnu/packages/education.scm, gnu/packages/efi.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/embedded.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/erlang.scm, gnu/packages/fabric-management.scm, gnu/packages/file-systems.scm, gnu/packages/finance.scm, gnu/packages/firmware.scm, gnu/packages/flashing-tools.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/fpga.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/genealogy.scm, gnu/packages/genimage.scm, gnu/packages/geo.scm, gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/gnome-xyz.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/golang.scm, gnu/packages/gpodder.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/groff.scm, gnu/packages/groovy.scm, gnu/packages/gtk.scm, gnu/packages/guile-xyz.scm, gnu/packages/guile.scm, gnu/packages/hardware.scm, gnu/packages/haskell-apps.scm, gnu/packages/haskell-xyz.scm, gnu/packages/hexedit.scm, gnu/packages/i2p.scm, gnu/packages/ibus.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/ipfs.scm, gnu/packages/java-graphics.scm, gnu/packages/java-maths.scm, gnu/packages/java.scm, gnu/packages/javascript.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/jupyter.scm, gnu/packages/kodi.scm, gnu/packages/language.scm, gnu/packages/lego.scm, gnu/packages/less.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm, gnu/packages/lirc.scm, gnu/packages/lisp-xyz.scm, gnu/packages/llvm.scm, gnu/packages/logging.scm, gnu/packages/lolcode.scm, gnu/packages/lua.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/maths.scm, gnu/packages/maven.scm, gnu/packages/mes.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/node-xyz.scm, gnu/packages/ocaml.scm, gnu/packages/ocr.scm, gnu/packages/onc-rpc.scm, gnu/packages/opencl.scm, gnu/packages/opencog.scm, gnu/packages/pantheon.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/perl6.scm, gnu/packages/phabricator.scm, gnu/packages/popt.scm, gnu/packages/printers.scm, gnu/packages/prolog.scm, gnu/packages/protobuf.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/qt.scm, gnu/packages/radio.scm, gnu/packages/rails.scm, gnu/packages/rdf.scm, gnu/packages/rednotebook.scm, gnu/packages/rpc.scm, gnu/packages/rsync.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/screen.scm, gnu/packages/security-token.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/shellutils.scm, gnu/packages/simh.scm, gnu/packages/sml.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/stenography.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/synergy.scm, gnu/packages/telephony.scm, gnu/packages/terminals.scm, gnu/packages/tex.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tmux.scm, gnu/packages/tor.scm, gnu/packages/toys.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/virtualization.scm, gnu/packages/vlang.scm, gnu/packages/vnc.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wireservice.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
1 year ago
gnu: Remove ".git" from "https://github/…/….git". Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix swh) would sometimes return #f for these because the ".git" URLs are redirects to the non-".git" URLs. Consequently, 'guix lint -c archival' would keep saying "scheduled Software Heritage archival"; likewise, the fallback download code would fail. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm, gnu/packages/android.scm, gnu/packages/animation.scm, gnu/packages/arcan.scm, gnu/packages/assembly.scm, gnu/packages/audio.scm, gnu/packages/authentication.scm, gnu/packages/avr.scm, gnu/packages/axoloti.scm, gnu/packages/backup.scm, gnu/packages/bash.scm, gnu/packages/benchmark.scm, gnu/packages/bioconductor.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/boost.scm, gnu/packages/build-tools.scm, gnu/packages/c.scm, gnu/packages/calendar.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/chez.scm, gnu/packages/clojure.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/compton.scm, gnu/packages/coq.scm, gnu/packages/cpp.scm, gnu/packages/cran.scm, gnu/packages/crypto.scm, gnu/packages/curl.scm, gnu/packages/databases.scm, gnu/packages/datastructures.scm, gnu/packages/debug.scm, gnu/packages/disk.scm, gnu/packages/distributed.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/dns.scm, gnu/packages/docker.scm, gnu/packages/education.scm, gnu/packages/efi.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/embedded.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/erlang.scm, gnu/packages/fabric-management.scm, gnu/packages/file-systems.scm, gnu/packages/finance.scm, gnu/packages/firmware.scm, gnu/packages/flashing-tools.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/fpga.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/genealogy.scm, gnu/packages/genimage.scm, gnu/packages/geo.scm, gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/gnome-xyz.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/golang.scm, gnu/packages/gpodder.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/groff.scm, gnu/packages/groovy.scm, gnu/packages/gtk.scm, gnu/packages/guile-xyz.scm, gnu/packages/guile.scm, gnu/packages/hardware.scm, gnu/packages/haskell-apps.scm, gnu/packages/haskell-xyz.scm, gnu/packages/hexedit.scm, gnu/packages/i2p.scm, gnu/packages/ibus.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/ipfs.scm, gnu/packages/java-graphics.scm, gnu/packages/java-maths.scm, gnu/packages/java.scm, gnu/packages/javascript.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/jupyter.scm, gnu/packages/kodi.scm, gnu/packages/language.scm, gnu/packages/lego.scm, gnu/packages/less.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm, gnu/packages/lirc.scm, gnu/packages/lisp-xyz.scm, gnu/packages/llvm.scm, gnu/packages/logging.scm, gnu/packages/lolcode.scm, gnu/packages/lua.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/maths.scm, gnu/packages/maven.scm, gnu/packages/mes.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/node-xyz.scm, gnu/packages/ocaml.scm, gnu/packages/ocr.scm, gnu/packages/onc-rpc.scm, gnu/packages/opencl.scm, gnu/packages/opencog.scm, gnu/packages/pantheon.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/perl6.scm, gnu/packages/phabricator.scm, gnu/packages/popt.scm, gnu/packages/printers.scm, gnu/packages/prolog.scm, gnu/packages/protobuf.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/qt.scm, gnu/packages/radio.scm, gnu/packages/rails.scm, gnu/packages/rdf.scm, gnu/packages/rednotebook.scm, gnu/packages/rpc.scm, gnu/packages/rsync.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/screen.scm, gnu/packages/security-token.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/shellutils.scm, gnu/packages/simh.scm, gnu/packages/sml.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/stenography.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/synergy.scm, gnu/packages/telephony.scm, gnu/packages/terminals.scm, gnu/packages/tex.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tmux.scm, gnu/packages/tor.scm, gnu/packages/toys.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/virtualization.scm, gnu/packages/vlang.scm, gnu/packages/vnc.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wireservice.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
1 year ago
  1. ;;; GNU Guix --- Functional package management for GNU
  2. ;;; Copyright © 2017 John Darrington <jmd@gnu.org>
  3. ;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
  4. ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
  5. ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
  6. ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
  7. ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
  8. ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
  9. ;;; Copyright © 2018 Lprndn <guix@lprndn.info>
  10. ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
  11. ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
  12. ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
  13. ;;;
  14. ;;; This file is part of GNU Guix.
  15. ;;;
  16. ;;; GNU Guix is free software; you can redistribute it and/or modify it
  17. ;;; under the terms of the GNU General Public License as published by
  18. ;;; the Free Software Foundation; either version 3 of the License, or (at
  19. ;;; your option) any later version.
  20. ;;;
  21. ;;; GNU Guix is distributed in the hope that it will be useful, but
  22. ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
  23. ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  24. ;;; GNU General Public License for more details.
  25. ;;;
  26. ;;; You should have received a copy of the GNU General Public License
  27. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
  28. (define-module (gnu packages image-processing)
  29. #:use-module ((guix licenses) #:prefix license:)
  30. #:use-module (guix packages)
  31. #:use-module (guix utils)
  32. #:use-module (guix download)
  33. #:use-module (guix git-download)
  34. #:use-module (guix build-system cmake)
  35. #:use-module (guix build-system gnu)
  36. #:use-module (gnu packages)
  37. #:use-module (gnu packages algebra)
  38. #:use-module (gnu packages bison)
  39. #:use-module (gnu packages boost)
  40. #:use-module (gnu packages check)
  41. #:use-module (gnu packages compression)
  42. #:use-module (gnu packages curl)
  43. #:use-module (gnu packages documentation)
  44. #:use-module (gnu packages flex)
  45. #:use-module (gnu packages fontutils)
  46. #:use-module (gnu packages geo)
  47. #:use-module (gnu packages ghostscript)
  48. #:use-module (gnu packages gl)
  49. #:use-module (gnu packages glib)
  50. #:use-module (gnu packages gnome)
  51. #:use-module (gnu packages graphics)
  52. #:use-module (gnu packages graphviz)
  53. #:use-module (gnu packages gstreamer)
  54. #:use-module (gnu packages gtk)
  55. #:use-module (gnu packages image)
  56. #:use-module (gnu packages imagemagick)
  57. #:use-module (gnu packages maths)
  58. #:use-module (gnu packages pdf)
  59. #:use-module (gnu packages perl)
  60. #:use-module (gnu packages photo)
  61. #:use-module (gnu packages pkg-config)
  62. #:use-module (gnu packages protobuf)
  63. #:use-module (gnu packages python)
  64. #:use-module (gnu packages python-xyz)
  65. #:use-module (gnu packages qt)
  66. #:use-module (gnu packages serialization)
  67. #:use-module (gnu packages tbb)
  68. #:use-module (gnu packages tls)
  69. #:use-module (gnu packages video)
  70. #:use-module (gnu packages xiph)
  71. #:use-module (gnu packages xml)
  72. #:use-module (gnu packages xorg)
  73. #:use-module (ice-9 match)
  74. #:use-module (srfi srfi-1))
  75. (define-public dcmtk
  76. (package
  77. (name "dcmtk")
  78. (version "3.6.5")
  79. (source
  80. (origin
  81. (method url-fetch)
  82. (uri
  83. (string-append "ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/"
  84. "dcmtk" (string-join (string-split version #\.) "")
  85. "/dcmtk-" version ".tar.gz"))
  86. (sha256
  87. (base32 "1fdyz5wwjp4grys61mxb2ia9fi6i3ax6s43l16xnv291bxk7hld0"))))
  88. (build-system cmake-build-system)
  89. (inputs
  90. `(;; Our ICU is too recent: “error: ‘UChar’ does not name a type“.
  91. ;; ("icu4c" ,icu4c)
  92. ("libjpeg" ,libjpeg-turbo)
  93. ("libpng" ,libpng)
  94. ("libtiff" ,libtiff)
  95. ("libxml2" ,libxml2)
  96. ("openssl" ,openssl)
  97. ("zlib" ,zlib)))
  98. (native-inputs
  99. `(("doxygen" ,doxygen))) ; for HTML documentation
  100. (home-page "https://dcmtk.org")
  101. (synopsis "Libraries and programs implementing parts of the DICOM standard")
  102. (description "DCMTK is a collection of libraries and applications
  103. implementing large parts the DICOM standard. It includes software for
  104. examining, constructing and converting DICOM image files, handling offline
  105. media, sending and receiving images over a network connection, as well as
  106. demonstrative image storage and worklist servers.")
  107. (license (license:fsf-free
  108. "file://COPYRIGHT"
  109. "A union of the Apache 2.0 licence and various non-copyleft
  110. licences similar to the Modified BSD licence."))))
  111. (define-public mia
  112. (package
  113. (name "mia")
  114. (version "2.4.6")
  115. (source (origin
  116. (method url-fetch)
  117. (uri (string-append "mirror://sourceforge/mia/mia/"
  118. (version-major+minor version)
  119. "/mia-" version ".tar.xz"))
  120. (sha256
  121. (base32
  122. "0j4nd5z7i3v199jh7hqqhwd4g7snchizkc7rhzanpvngqg91m1pb"))))
  123. (build-system cmake-build-system)
  124. (arguments
  125. `(#:configure-flags
  126. (list "-DMIA_CREATE_NIPYPE_INTERFACES=0"
  127. "-DCMAKE_CXX_FLAGS=-fpermissive")))
  128. (inputs
  129. `(("boost" ,boost)
  130. ("dcmtk" ,dcmtk)
  131. ("doxygen" ,doxygen)
  132. ("eigen" ,eigen)
  133. ("fftw" ,fftw)
  134. ("fftwf" ,fftwf)
  135. ("gsl" ,gsl)
  136. ("gts" ,gts)
  137. ("hdf5" ,hdf5)
  138. ("itpp" ,itpp)
  139. ("libjpeg" ,libjpeg-turbo)
  140. ("libpng" ,libpng)
  141. ("libtiff" ,libtiff)
  142. ("libxml" ,libxml2)
  143. ("libxml++" ,libxml++)
  144. ("maxflow" ,maxflow)
  145. ("niftilib" ,niftilib)
  146. ("nlopt" ,nlopt)
  147. ("openexr" ,openexr)
  148. ("python-lxml" ,python2-lxml)
  149. ("vtk" ,vtk)))
  150. (native-inputs
  151. `(("pkg-config" ,pkg-config)
  152. ("python" ,python-2)))
  153. (home-page "http://mia.sourceforge.net")
  154. (synopsis "Toolkit for gray scale medical image analysis")
  155. (description "MIA provides a combination of command line tools, plug-ins,
  156. and libraries that make it possible run image processing tasks interactively
  157. in a command shell and to prototype using the shell's scripting language. It
  158. is built around a plug-in structure that makes it easy to add functionality
  159. without compromising the original code base and it makes use of a wide variety
  160. of external libraries that provide additional functionality.")
  161. (license license:gpl3+)))
  162. (define-public vtk
  163. (package
  164. (name "vtk")
  165. (version "8.2.0")
  166. (source (origin
  167. (method url-fetch)
  168. (uri (string-append "https://vtk.org/files/release/"
  169. (version-major+minor version)
  170. "/VTK-" version ".tar.gz"))
  171. (sha256
  172. (base32
  173. "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"))))
  174. (build-system cmake-build-system)
  175. (arguments
  176. '(#:build-type "Release" ;Build without '-g' to save space.
  177. ;; -DVTK_USE_SYSTEM_NETCDF:BOOL=TRUE requires netcdf_cxx
  178. #:configure-flags '("-DVTK_USE_SYSTEM_EXPAT:BOOL=TRUE"
  179. "-DVTK_USE_SYSTEM_FREETYPE:BOOL=TRUE"
  180. "-DVTK_USE_SYSTEM_HDF5:BOOL=TRUE"
  181. "-DVTK_USE_SYSTEM_JPEG:BOOL=TRUE"
  182. "-DVTK_USE_SYSTEM_JSONCPP:BOOL=TRUE"
  183. "-DVTK_USE_SYSTEM_LIBXML2:BOOL=TRUE"
  184. "-DVTK_USE_SYSTEM_OGGTHEORA:BOOL=TRUE"
  185. "-DVTK_USE_SYSTEM_PNG:BOOL=TRUE"
  186. "-DVTK_USE_SYSTEM_TIFF:BOOL=TRUE"
  187. "-DVTK_USE_SYSTEM_ZLIB:BOOL=TRUE")
  188. #:tests? #f)) ;XXX: no "test" target
  189. (inputs
  190. `(("libXt" ,libxt)
  191. ("xorgproto" ,xorgproto)
  192. ("libX11" ,libx11)
  193. ("libxml2" ,libxml2)
  194. ("mesa" ,mesa)
  195. ("glu" ,glu)
  196. ("expat" ,expat)
  197. ("freetype" ,freetype)
  198. ("hdf5" ,hdf5)
  199. ("jpeg" ,libjpeg-turbo)
  200. ("jsoncpp" ,jsoncpp)
  201. ("libogg" ,libogg)
  202. ("libtheora" ,libtheora)
  203. ("png" ,libpng)
  204. ("tiff" ,libtiff)
  205. ("zlib" ,zlib)))
  206. (home-page "https://vtk.org/")
  207. (synopsis "Libraries for 3D computer graphics")
  208. (description
  209. "The Visualization Toolkit (VTK) is a C++ library for 3D computer graphics,
  210. image processing and visualization. It supports a wide variety of
  211. visualization algorithms including: scalar, vector, tensor, texture, and
  212. volumetric methods; and advanced modeling techniques such as: implicit
  213. modeling, polygon reduction, mesh smoothing, cutting, contouring, and Delaunay
  214. triangulation. VTK has an extensive information visualization framework, has
  215. a suite of 3D interaction widgets, supports parallel processing, and
  216. integrates with various databases on GUI toolkits such as Qt and Tk.")
  217. (license license:bsd-3)))
  218. ;; itksnap needs an older variant of VTK.
  219. (define-public vtk-6
  220. (package (inherit vtk)
  221. (version "6.3.0")
  222. (source (origin
  223. (method url-fetch)
  224. (uri (string-append "https://vtk.org/files/release/"
  225. (version-major+minor version)
  226. "/VTK-" version ".tar.gz"))
  227. (sha256
  228. (base32
  229. "0pla1r5mvkgl4sl213gfdhzrypdgai0h3z5mfgm6p9jz9hsr794j"))))
  230. (inputs
  231. `(("jsoncpp" ,jsoncpp-for-tensorflow)
  232. ,@(alist-delete "jsoncpp" (package-inputs vtk))))))
  233. (define-public opencv
  234. (package
  235. (name "opencv")
  236. (version "3.4.3")
  237. (source (origin
  238. (method git-fetch)
  239. (uri (git-reference
  240. (url "https://github.com/opencv/opencv")
  241. (commit version)))
  242. (file-name (git-file-name name version))
  243. (sha256
  244. (base32
  245. "06bc61r8myym4s8im10brdjfg4wxkrvsbhhl7vr1msdan2xddzi3"))
  246. (modules '((guix build utils)))
  247. (snippet
  248. '(begin
  249. ;; Remove external libraries. We have all available in Guix:
  250. (delete-file-recursively "3rdparty")
  251. ;; Milky icon set is non-free:
  252. (delete-file-recursively "modules/highgui/src/files_Qt/Milky")
  253. ;; Some jars found:
  254. (for-each delete-file
  255. '("modules/java/test/pure_test/lib/junit-4.11.jar"
  256. "samples/java/sbt/sbt/sbt-launch.jar"))
  257. #t))))
  258. (build-system cmake-build-system)
  259. (arguments
  260. `(#:configure-flags
  261. (list "-DWITH_IPP=OFF"
  262. "-DWITH_ITT=OFF"
  263. "-DWITH_CAROTENE=OFF" ; only visible on arm/aarch64
  264. "-DENABLE_PRECOMPILED_HEADERS=OFF"
  265. ;; CPU-Features:
  266. ;; See cmake/OpenCVCompilerOptimizations.cmake
  267. ;; (CPU_ALL_OPTIMIZATIONS) for a list of all optimizations
  268. ;; BASELINE is the minimum optimization all CPUs must support
  269. ;;
  270. ;; DISPATCH is the list of optional dispatches.
  271. "-DCPU_BASELINE=SSE2"
  272. ,@(match (%current-system)
  273. ("x86_64-linux"
  274. '("-DCPU_DISPATCH=NEON;VFPV3;FP16;SSE;SSE2;SSE3;SSSE3;SSE4_1;SSE4_2;POPCNT;AVX;FP16;AVX2;FMA3;AVX_512F;AVX512_SKX"
  275. "-DCPU_DISPATCH_REQUIRE=SSE3,SSSE3,SSE4_1,SSE4_2,AVX,AVX2"))
  276. ("armhf-linux"
  277. '("-DCPU_BASELINE_DISABLE=NEON")) ; causes build failures
  278. ("aarch64-linux"
  279. '("-DCPU_BASELINE=NEON"
  280. "-DCPU_DISPATCH=NEON;VFPV3;FP16"))
  281. (_ '()))
  282. "-DBUILD_PERF_TESTS=OFF"
  283. "-DBUILD_TESTS=ON"
  284. (string-append "-DOPENCV_EXTRA_MODULES_PATH=" (getcwd)
  285. "/opencv-contrib/modules")
  286. ;;Define test data:
  287. (string-append "-DOPENCV_TEST_DATA_PATH=" (getcwd)
  288. "/opencv-extra/testdata")
  289. ;; Is ON by default and would try to rebuild 3rd-party protobuf,
  290. ;; which we had removed, which would lead to an error:
  291. "-DBUILD_PROTOBUF=OFF"
  292. ;; Rebuild protobuf files, because we have a slightly different
  293. ;; version than the included one. If we would not update, we
  294. ;; would get a compile error later:
  295. "-DPROTOBUF_UPDATE_FILES=ON"
  296. ;; xfeatures2d disabled, because it downloads extra binaries from
  297. ;; https://github.com/opencv/opencv_3rdparty
  298. ;; defined in xfeatures2d/cmake/download_{vgg|bootdesc}.cmake
  299. ;; Cmp this bug entry:
  300. ;; https://github.com/opencv/opencv_contrib/issues/1131
  301. "-DBUILD_opencv_xfeatures2d=OFF")
  302. #:phases
  303. (modify-phases %standard-phases
  304. (add-after 'unpack 'disable-broken-tests
  305. (lambda _
  306. ;; These tests fails with:
  307. ;; vtkXOpenGLRenderWindow (0x723990): Could not find a decent config
  308. ;; I think we have no OpenGL support with the Xvfb.
  309. (substitute* '("modules/viz/test/test_tutorial3.cpp"
  310. "modules/viz/test/test_main.cpp"
  311. "modules/viz/test/tests_simple.cpp"
  312. "modules/viz/test/test_viz3d.cpp")
  313. (("(TEST\\(Viz, )([a-z].*\\).*)" all pre post)
  314. (string-append pre "DISABLED_" post)))
  315. ;; This one fails with "unknown file: Failure"
  316. ;; But I couldn't figure out which file was missing:
  317. (substitute* "../opencv-contrib/modules/face/test/test_face_align.cpp"
  318. (("(TEST\\(CV_Face_FacemarkKazemi, )(can_detect_landmarks\\).*)"
  319. all pre post)
  320. (string-append pre "DISABLED_" post)))
  321. ;; Failure reason: Bad accuracy
  322. ;; Incorrect count of accurate poses [2nd case]: 90.000000 / 94.000000
  323. (substitute* "../opencv-contrib/modules/rgbd/test/test_odometry.cpp"
  324. (("(TEST\\(RGBD_Odometry_Rgbd, )(algorithmic\\).*)" all pre post)
  325. (string-append pre "DISABLED_" post)))
  326. #t))
  327. (add-after 'unpack 'unpack-submodule-sources
  328. (lambda* (#:key inputs #:allow-other-keys)
  329. (mkdir "../opencv-extra")
  330. (mkdir "../opencv-contrib")
  331. (copy-recursively (assoc-ref inputs "opencv-extra")
  332. "../opencv-extra")
  333. (invoke "tar" "xvf"
  334. (assoc-ref inputs "opencv-contrib")
  335. "--strip-components=1"
  336. "-C" "../opencv-contrib")))
  337. (add-after 'set-paths 'add-ilmbase-include-path
  338. (lambda* (#:key inputs #:allow-other-keys)
  339. ;; OpenEXR propagates ilmbase, but its include files do not appear
  340. ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
  341. ;; the CPATH to satisfy the dependency on "ImathVec.h".
  342. (setenv "CPATH"
  343. (string-append (assoc-ref inputs "ilmbase")
  344. "/include/OpenEXR"
  345. ":" (or (getenv "CPATH") "")))
  346. #t))
  347. (add-before 'check 'start-xserver
  348. (lambda* (#:key inputs #:allow-other-keys)
  349. (let ((xorg-server (assoc-ref inputs "xorg-server"))
  350. (disp ":1"))
  351. (setenv "HOME" (getcwd))
  352. (setenv "DISPLAY" disp)
  353. ;; There must be a running X server and make check doesn't start one.
  354. ;; Therefore we must do it.
  355. (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp)))))))))
  356. (native-inputs
  357. `(("pkg-config" ,pkg-config)
  358. ("xorg-server" ,xorg-server-for-tests) ; For running the tests
  359. ("opencv-extra"
  360. ,(origin
  361. (method git-fetch)
  362. (uri (git-reference
  363. (url "https://github.com/opencv/opencv_extra")
  364. (commit version)))
  365. (file-name (git-file-name "opencv_extra" version))
  366. (sha256
  367. (base32 "08p5xnq8n1jw8svvz0fnirfg7q8dm3p4a5dl7527s5xj0f9qn7lp"))))
  368. ("opencv-contrib"
  369. ,(origin
  370. (method git-fetch)
  371. (uri (git-reference
  372. (url "https://github.com/opencv/opencv_contrib")
  373. (commit version)))
  374. (file-name (git-file-name "opencv_contrib" version))
  375. (patches (search-patches "opencv-rgbd-aarch64-test-fix.patch"))
  376. (sha256
  377. (base32 "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2"))))))
  378. (inputs `(("libjpeg" ,libjpeg-turbo)
  379. ("libpng" ,libpng)
  380. ("jasper" ,jasper)
  381. ;; ffmpeg 4.0 causes core dumps in tests.
  382. ("ffmpeg" ,ffmpeg-3.4)
  383. ("libtiff" ,libtiff)
  384. ("hdf5" ,hdf5)
  385. ("libgphoto2" ,libgphoto2)
  386. ("libwebp" ,libwebp)
  387. ("zlib" ,zlib)
  388. ("gtkglext" ,gtkglext)
  389. ("openexr" ,openexr)
  390. ("ilmbase" ,ilmbase)
  391. ("gtk+" ,gtk+-2)
  392. ("python-numpy" ,python-numpy)
  393. ("protobuf" ,protobuf)
  394. ("vtk" ,vtk)
  395. ("python" ,python)))
  396. ;; These three CVEs are not a problem of OpenCV, see:
  397. ;; https://github.com/opencv/opencv/issues/10998
  398. (properties '((lint-hidden-cve . ("CVE-2018-7712"
  399. "CVE-2018-7713"
  400. "CVE-2018-7714"))))
  401. (synopsis "Computer vision library")
  402. (description "OpenCV is a library aimed at
  403. real-time computer vision, including several hundred computer
  404. vision algorithms. It can be used to do things like:
  405. @itemize
  406. @item image and video input and output
  407. @item image and video processing
  408. @item displaying
  409. @item feature recognition
  410. @item segmentation
  411. @item facial recognition
  412. @item stereo vision
  413. @item structure from motion
  414. @item augmented reality
  415. @item machine learning
  416. @end itemize\n")
  417. (home-page "https://opencv.org/")
  418. (license license:bsd-3)))
  419. (define-public vips
  420. (package
  421. (name "vips")
  422. (version "8.7.4")
  423. (source
  424. (origin
  425. (method url-fetch)
  426. (uri (string-append
  427. "https://github.com/libvips/libvips/releases/download/v"
  428. version "/vips-" version ".tar.gz"))
  429. (sha256
  430. (base32 "01gjhcrl6zj7mcj1al717v5jsniahplqhz1xkfh2j78vyfl1hxff"))))
  431. (build-system gnu-build-system)
  432. (native-inputs
  433. `(("pkg-config" ,pkg-config)
  434. ("gobject-introspection" ,gobject-introspection)))
  435. (inputs
  436. `(("glib" ,glib)
  437. ("libjpeg" ,libjpeg-turbo)
  438. ("libpng" ,libpng)
  439. ("librsvg" ,librsvg)
  440. ("libtiff" ,libtiff)
  441. ("libexif" ,libexif)
  442. ("giflib" ,giflib)
  443. ("libgsf" ,libgsf)
  444. ("fftw" ,fftw)
  445. ("poppler" ,poppler)
  446. ("pango" ,pango)
  447. ("lcms" ,lcms)
  448. ("matio" ,matio)
  449. ("libwebp" ,libwebp)
  450. ("niftilib" ,niftilib)
  451. ("openexr" ,openexr)
  452. ("orc" ,orc)
  453. ("imagemagick" ,imagemagick)
  454. ("libxml2" ,libxml2)
  455. ("expat" ,expat)
  456. ("hdf5" ,hdf5)))
  457. (home-page "https://libvips.github.io/libvips/")
  458. (synopsis "Multithreaded image processing system with low memory needs")
  459. (description
  460. "VIPS is a demand-driven, horizontally threaded image processing library.
  461. It's particularly good at processing large images, working with colour,
  462. scientific analysis, and general research & development.
  463. Compared to most image processing libraries VIPS needs little RAM and runs
  464. quickly, especially on machines with more than one CPU core. This is primarily
  465. due to its architecture which automatically parallelises the image workflows.")
  466. (license license:lgpl2.1+)))
  467. (define-public gmic
  468. (package
  469. (name "gmic")
  470. (version "2.9.1")
  471. (source
  472. (origin
  473. (method url-fetch)
  474. (uri (string-append "https://gmic.eu/files/source/gmic_"
  475. version ".tar.gz"))
  476. (sha256
  477. (base32 "13axx7nwchn6ysgpvlw3fib474q4nrwv3qn20g3q03ldid0xvjah"))))
  478. (build-system cmake-build-system)
  479. (arguments
  480. `(#:tests? #f)) ;there are no tests
  481. (native-inputs
  482. `(("pkg-config" ,pkg-config)))
  483. (inputs
  484. `(("curl" ,curl)
  485. ("fftw" ,fftw)
  486. ("graphicsmagick" ,graphicsmagick)
  487. ("libjpeg-turbo" ,libjpeg-turbo)
  488. ("libpng" ,libpng)
  489. ("libtiff" ,libtiff)
  490. ("libx11" ,libx11)
  491. ;;("opencv" ,opencv) ;OpenCV is currently broken in the CI
  492. ("openexr" ,openexr)
  493. ("zlib" ,zlib)))
  494. (home-page "https://gmic.eu/")
  495. (synopsis "Full-featured framework for digital image processing")
  496. (description "G'MIC is a full-featured framework for digital image
  497. processing. It provides several user interfaces to convert / manipulate
  498. / filter / visualize generic image datasets, ranging from 1D scalar
  499. signals to 3D+t sequences of multi-spectral volumetric images, hence
  500. including 2D color images.")
  501. ;; Dual-licensed, either license applies.
  502. (license (list license:cecill license:cecill-c))))
  503. (define-public nip2
  504. (package
  505. (name "nip2")
  506. (version "8.7.1")
  507. (source
  508. (origin
  509. (method url-fetch)
  510. (uri (string-append "https://github.com/libvips/nip2/releases/download/v"
  511. version "/nip2-" version ".tar.gz" ))
  512. (sha256
  513. (base32 "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw"))))
  514. (build-system gnu-build-system)
  515. (arguments
  516. `(#:phases
  517. (modify-phases %standard-phases
  518. ;; test_conv.ws keep failing so disabling for now.
  519. (add-after 'unpack 'disable-test-conv
  520. (lambda _
  521. (delete-file "test/workspaces/test_conv.ws")
  522. #t))
  523. (add-before 'check 'set-home
  524. (lambda _
  525. (setenv "HOME" "/tmp") #t)))))
  526. (inputs
  527. `(("vips" ,vips)
  528. ("glib" ,glib)
  529. ("libtiff" ,libtiff)
  530. ("gtk+-2" ,gtk+-2)
  531. ("libxml2" ,libxml2)
  532. ("libexif" ,libexif)
  533. ("libjpeg" ,libjpeg-turbo) ;required by vips.pc
  534. ("librsvg" ,librsvg)
  535. ("fftw" ,fftw)
  536. ("libgsf" ,libgsf)
  537. ("imagemagick" ,imagemagick)
  538. ("orc" ,orc)
  539. ("matio" ,matio)
  540. ("lcms" ,lcms)
  541. ("libwebp" ,libwebp)
  542. ("openexr" ,openexr)
  543. ("poppler" ,poppler)
  544. ("gsl" ,gsl)))
  545. (native-inputs
  546. `(("flex" ,flex)
  547. ("bison" ,bison)
  548. ("pkg-config" ,pkg-config)))
  549. (home-page "https://github.com/libvips/nip2")
  550. (synopsis "Spreadsheet-like GUI for libvips")
  551. (description "This package provide a graphical user interface (GUI) for
  552. the VIPS image processing library. It's a little like a spreadsheet: you
  553. create a set of formula connecting your objects together, and on a change nip2
  554. recalculates.")
  555. (license license:gpl2+)))
  556. (define-public vxl
  557. (package
  558. (name "vxl")
  559. (version "2.0.2")
  560. (source
  561. (origin
  562. (method git-fetch)
  563. (uri (git-reference
  564. (url "https://github.com/vxl/vxl")
  565. (commit (string-append "v" version))))
  566. (file-name (git-file-name name version))
  567. (sha256
  568. (base32 "0949hw57szq8943f1whwqaz591xjmb19kj803hcv74hdai2b0ycg"))
  569. (modules '((guix build utils)))
  570. ;; TODO: vxl includes an old version of dcmtk. It won't build with
  571. ;; version 3.6.x.
  572. (snippet
  573. '(begin
  574. (for-each delete-file-recursively
  575. '("v3p/bzlib/"
  576. "v3p/geotiff/"
  577. "v3p/jpeg/"
  578. "v3p/png/"
  579. "v3p/tiff/"
  580. "v3p/zlib/"))
  581. (substitute* "v3p/CMakeLists.txt"
  582. (("add_subdirectory\\((tiff|png|jpeg|zlib|bzlib|geotiff)\\)")
  583. ""))
  584. #t))))
  585. (build-system cmake-build-system)
  586. (inputs
  587. `(("libgeotiff" ,libgeotiff)
  588. ("libtiff" ,libtiff)
  589. ("libjpeg" ,libjpeg-turbo)
  590. ("libpng" ,libpng)
  591. ("zlib" ,zlib)))
  592. (home-page "https://github.com/vxl/vxl/")
  593. (synopsis "Collection of C++ libraries for computer vision")
  594. (description "VXL (the Vision-something-Libraries) is a collection of C++
  595. libraries designed for computer vision research and implementation.")
  596. (license license:bsd-3)))
  597. (define-public vxl-1
  598. (package (inherit vxl)
  599. (name "vxl")
  600. (version "1.18.0")
  601. (source
  602. (origin
  603. (method git-fetch)
  604. (uri (git-reference
  605. (url "https://github.com/vxl/vxl")
  606. (commit (string-append "v" version))))
  607. (file-name (git-file-name name version))
  608. (sha256
  609. (base32 "1g4mr2cc58jwm0vasscbd4y5380wj3ahkvq121z4gs83fhavvxgz"))
  610. (modules '((guix build utils)))
  611. (snippet
  612. '(begin
  613. (for-each delete-file-recursively
  614. '("v3p/bzlib/"
  615. "v3p/geotiff/"
  616. "v3p/png/"
  617. "v3p/tiff/"
  618. "v3p/zlib/"))
  619. (substitute* "v3p/CMakeLists.txt"
  620. (("add_subdirectory\\((tiff|png|jpeg|zlib|bzlib|geotiff)\\)")
  621. ""))
  622. #t))))
  623. (arguments
  624. `(#:configure-flags
  625. ;; Needed for itk-snap
  626. (list "-DVNL_CONFIG_LEGACY_METHODS=ON")))))
  627. (define-public insight-toolkit
  628. (package
  629. (name "insight-toolkit")
  630. (version "5.0.0")
  631. (source
  632. (origin
  633. (method url-fetch)
  634. (uri (string-append "https://github.com/InsightSoftwareConsortium/ITK/"
  635. "releases/download/v" version "/InsightToolkit-"
  636. version ".tar.xz"))
  637. (sha256
  638. (base32 "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi"))))
  639. (build-system cmake-build-system)
  640. (arguments
  641. `(#:tests? #f ; tests require network access and external data
  642. #:configure-flags
  643. '("-DITK_USE_GPU=ON"
  644. "-DITK_USE_SYSTEM_LIBRARIES=ON"
  645. "-DITK_USE_SYSTEM_GOOGLETEST=ON"
  646. "-DITK_BUILD_SHARED=ON"
  647. ;; This prevents "GTest::GTest" from being added to the ITK_LIBRARIES
  648. ;; variable in the installed CMake files. This is necessary as other
  649. ;; packages using insight-toolkit could not be configured otherwise.
  650. "-DGTEST_ROOT=gtest")
  651. #:phases
  652. (modify-phases %standard-phases
  653. (add-after 'unpack 'do-not-tune
  654. (lambda _
  655. (substitute* "CMake/ITKSetStandardCompilerFlags.cmake"
  656. (("-mute=native") ""))
  657. #t)))))
  658. (inputs
  659. `(("eigen" ,eigen)
  660. ("expat" ,expat)
  661. ("fftw" ,fftw)
  662. ("fftwf" ,fftwf)
  663. ("hdf5" ,hdf5)
  664. ("libjpeg" ,libjpeg-turbo)
  665. ("libpng" ,libpng)
  666. ("libtiff" ,libtiff)
  667. ("mesa" ,mesa-opencl)
  668. ("perl" ,perl)
  669. ("python" ,python)
  670. ("tbb" ,tbb)
  671. ("vxl" ,vxl-1)
  672. ("zlib" ,zlib)))
  673. (native-inputs
  674. `(("googletest" ,googletest)
  675. ("pkg-config" ,pkg-config)))
  676. (home-page "https://github.com/InsightSoftwareConsortium/ITK/")
  677. (synopsis "Scientific image processing, segmentation and registration")
  678. (description "The Insight Toolkit (ITK) is a toolkit for N-dimensional
  679. scientific image processing, segmentation, and registration. Segmentation is
  680. the process of identifying and classifying data found in a digitally sampled
  681. representation. Typically the sampled representation is an image acquired
  682. from such medical instrumentation as CT or MRI scanners. Registration is the
  683. task of aligning or developing correspondences between data. For example, in
  684. the medical environment, a CT scan may be aligned with a MRI scan in order to
  685. combine the information contained in both.")
  686. (license license:asl2.0)))
  687. (define-public insight-toolkit-4
  688. (package (inherit insight-toolkit)
  689. (version "4.13.2")
  690. (source
  691. (origin
  692. (method url-fetch)
  693. (uri (string-append "https://github.com/InsightSoftwareConsortium/ITK/"
  694. "releases/download/v" version "/InsightToolkit-"
  695. version ".tar.xz"))
  696. (sha256
  697. (base32 "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"))))
  698. (arguments
  699. `(#:tests? #f ; tests require network access and external data
  700. #:configure-flags
  701. '("-DITKV3_COMPATIBILITY=ON" ; needed for itk-snap
  702. "-DITK_USE_GPU=ON"
  703. "-DITK_USE_SYSTEM_LIBRARIES=ON"
  704. "-DITK_USE_SYSTEM_GOOGLETEST=ON"
  705. "-DITK_USE_SYSTEM_VXL=ON")))))
  706. (define-public insight-toolkit-4.12
  707. (package (inherit insight-toolkit-4)
  708. (version "4.12.2")
  709. (source
  710. (origin
  711. (method url-fetch)
  712. (uri (string-append "mirror://sourceforge/itk/itk/4.12/"
  713. "InsightToolkit-" version ".tar.xz"))
  714. (sha256
  715. (base32 "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w"))))))
  716. (define-public itk-snap
  717. (package
  718. (name "itk-snap")
  719. (version "3.8.0")
  720. (source
  721. (origin
  722. (method git-fetch)
  723. (uri (git-reference
  724. (url "https://git.code.sf.net/p/itk-snap/src")
  725. (commit (string-append "v" version))))
  726. (file-name (git-file-name name version))
  727. (sha256
  728. (base32 "15i5ixpryfrbf3vrrb5rici8fb585f25k0v1ljds16bp1f1msr4q"))))
  729. (build-system cmake-build-system)
  730. (arguments
  731. `(#:configure-flags
  732. (list "-DSNAP_VERSION_GIT_SHA1=release"
  733. "-DSNAP_VERSION_GIT_BRANCH=release"
  734. "-DSNAP_VERSION_GIT_TIMESTAMP=0"
  735. "-DSNAP_PACKAGE_QT_PLUGINS=OFF"
  736. "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
  737. #:phases
  738. (modify-phases %standard-phases
  739. ;; During the installation phase all libraries provided by all
  740. ;; dependencies will be copied to the lib directory. That's insane,
  741. ;; so we disable this.
  742. (add-after 'unpack 'do-not-copy-dependencies
  743. (lambda _
  744. (substitute* "CMakeLists.txt"
  745. (("install_qt5_executable\
  746. \\(\\$\\{SNAP_MAIN_INSTALL_DIR\\}/\\$\\{SNAP_EXE\\}\\)")
  747. ""))
  748. #t))
  749. (add-after 'unpack 'disable-gui-tests
  750. (lambda _
  751. ;; The GUI tests just time out.
  752. (substitute* "CMakeLists.txt"
  753. ((" (Workspace|DiffSpace|ProbeIntensity|RegionCompetition\
  754. |RandomForest|RandomForestBailOut)")
  755. ""))
  756. #t))
  757. (add-after 'unpack 'make-reproducible
  758. (lambda _
  759. (substitute* "CMakeLists.txt"
  760. (("TODAY\\(SNAP_VERSION_COMPILE_DATE\\)")
  761. "SET(SNAP_VERSION_COMPILE_DATE \"(removed for reproducibility)\")"))
  762. #t))
  763. (add-after 'unpack 'prepare-submodules
  764. (lambda* (#:key inputs #:allow-other-keys)
  765. (rmdir "Submodules/c3d")
  766. (copy-recursively (assoc-ref inputs "c3d-src")
  767. "Submodules/c3d")
  768. (substitute* '("Submodules/c3d/adapters/BiasFieldCorrectionN4.cxx"
  769. "Submodules/c3d/adapters/ApplyMetric.cxx")
  770. (("vcl_") "std::"))
  771. (rmdir "Submodules/greedy")
  772. (symlink (assoc-ref inputs "greedy-src")
  773. "Submodules/greedy")
  774. #t))
  775. (add-after 'unpack 'fix-includes
  776. (lambda _
  777. (substitute* "GUI/Model/RegistrationModel.cxx"
  778. (("<vnl_symmetric_eigensystem.h>")
  779. "<vnl/algo/vnl_symmetric_eigensystem.h>"))
  780. #t))
  781. (add-before 'check 'prepare-tests
  782. (lambda _
  783. ;; Needed by at least one test.
  784. (setenv "HOME" "/tmp")
  785. #t))
  786. (add-after 'install 'wrap-executable
  787. (lambda* (#:key inputs outputs #:allow-other-keys)
  788. (let ((out (assoc-ref outputs "out")))
  789. (wrap-program (string-append out "/bin/itksnap")
  790. `("QT_PLUGIN_PATH" ":" prefix
  791. ,(map (lambda (label)
  792. (string-append (assoc-ref inputs label)
  793. "/lib/qt5/plugins"))
  794. '("qtbase" "qtdeclarative"))))
  795. #t))))))
  796. (inputs
  797. `(("curl" ,curl)
  798. ("fftw" ,fftw)
  799. ("fftwf" ,fftwf)
  800. ("glu" ,glu)
  801. ("hdf5" ,hdf5)
  802. ("mesa" ,mesa-opencl)
  803. ;; This package does not build with either insight-toolkit 5.0.0 and
  804. ;; not with 4.13. It really needs to be 4.12.
  805. ("itk" ,insight-toolkit-4.12)
  806. ("vtk" ,vtk-6)
  807. ("qtbase" ,qtbase)
  808. ("qtdeclarative" ,qtdeclarative)
  809. ("vxl" ,vxl-1)
  810. ("zlib" ,zlib)))
  811. (native-inputs
  812. `(("googletest" ,googletest)
  813. ("qttools" ,qttools)
  814. ("pkg-config" ,pkg-config)
  815. ("c3d-src"
  816. ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3")
  817. (revision "1")
  818. (version (git-version "0" revision commit)))
  819. (origin
  820. (method git-fetch)
  821. (uri (git-reference
  822. (url "https://github.com/pyushkevich/c3d")
  823. (commit commit)))
  824. (file-name (git-file-name "c3d" version))
  825. (sha256
  826. (base32
  827. "0kyv3rxrxwr8c3sa9zv01lsnhk95b27gx1s870k3yi8qp52h7bx3")))))
  828. ;; We are using an arbitrary commit from 2017 because the latest
  829. ;; version breaks the build...
  830. ("greedy-src"
  831. ,(let* ((commit "97e340f7e8e66597599144947775e6039e79a0d3")
  832. (revision "1")
  833. (version (git-version "0" revision commit)))
  834. (origin
  835. (method git-fetch)
  836. (uri (git-reference
  837. (url "https://github.com/pyushkevich/greedy")
  838. (commit commit)))
  839. (file-name (git-file-name "greedy" version))
  840. (sha256
  841. (base32
  842. "0k5bc9za4jrc8z9dj08z1rkcp5xf0gnd1d2jmi1w9ny4vxh2q2ab")))))))
  843. (home-page "https://sourceforge.net/p/itk-snap/")
  844. (synopsis "Medical image segmentation")
  845. (description "ITK-SNAP is a tool for segmenting anatomical structures in
  846. medical images. It provides an automatic active contour segmentation
  847. pipeline, along with supporting a manual segmentation toolbox. ITK-SNAP has a
  848. full-featured UI aimed at clinical researchers.")
  849. ;; This includes the submodules greedy and c3d.
  850. (license license:gpl3+)))