Merge branch 'master' into gtk-rebuild
Conflicts:
gnu/packages/gtk.scm
gnu: Tweak a few synopses and descriptions reported by 'lint'.
* gnu/packages/haskell.scm (ghc-text)[synopsis]: Remove period.
[description]: Two space after end-of-sentence periods.
(ghc-http)[description]: Likewise.
* gnu/packages/image.scm (libwebp)[description]: Likewise.
* gnu/packages/libedit.scm (libedit)[description]: Likewise.
* gnu/packages/kde.scm (oxygen-icons)[synopsis]: Capitalize.
Merge branch 'master' into core-updates
gnu: imlib2: Update to 1.4.7.
* gnu/packages/image.scm (imlib2): Update to 1.4.7.
Merge branch 'core-updates'
utils: 'modify-phases' no longer introduces quotes.
Suggested by Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>.
* guix/build/utils.scm (%modify-phases): Remove quotes.
* guix/build/cmake-build-system.scm (%standard-phases): Adjust
accordingly.
* guix/build/glib-or-gtk-build-system.scm (%standard-phases): Likewise.
* guix/build/gnu-dist.scm (%dist-phases): Likewise.
* guix/build/perl-build-system.scm (%standard-phases): Likewise.
* guix/build/python-build-system.scm (%standard-phases): Likewise.
* guix/build/ruby-build-system.scm (%standard-phases): Likewise.
* guix/build/waf-build-system.scm (%standard-phases): Likewise.
* gnu/packages/bash.scm, gnu/packages/code.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/graphics.scm,
gnu/packages/image.scm, gnu/packages/key-mon.scm,
gnu/packages/ocr.scm, gnu/packages/plotutils.scm,
gnu/packages/search.scm, gnu/packages/video.scm: Likewise.
Merge branch 'master' into core-updates
gnu: Add leptonica.
* gnu/packages/image.scm (leptonica): New variable.
gnu: Add libwebp.
* gnu/packages/image.scm (libwebp): New variable.
Merge branch 'master' into core-updates
gnu: Update packages to use 'non-copyleft' instead of 'bsd-style'.
* gnu/packages/avr.scm, gnu/packages/compression.scm,
gnu/packages/curl.scm, gnu/packages/cyrus-sasl.scm,
gnu/packages/databases.scm, gnu/packages/firmware.scm,
gnu/packages/flex.scm, gnu/packages/fontutils.scm,
gnu/packages/gd.scm, gnu/packages/ghostscript.scm,
gnu/packages/gnunet.scm, gnu/packages/graphics.scm,
gnu/packages/hugs.scm, gnu/packages/image.scm,
gnu/packages/linux.scm, gnu/packages/mail.scm,
gnu/packages/maths.scm, gnu/packages/mit-krb5.scm,
gnu/packages/python.scm, gnu/packages/rdf.scm,
gnu/packages/ssh.scm, gnu/packages/tcl.scm,
gnu/packages/xdisorg.scm, gnu/packages/xiph.scm,
gnu/packages/yasm.scm, gnu/packages/zip.scm: Use 'non-copyleft'
instead of 'bsd-style'.
gnu: Add libungif.
* gnu/packages/image.scm (libungif): New variable.
Merge branch 'core-updates'.
gnu: Remove now unneeded 'unpack' phases for unzip.
This is a followup to commit cd0385b.
* gnu/packages/bioinformatics.scm (hisat)[arguments]: Remove 'unpack'
phase.
* gnu/packages/image.scm (freeimage): Likewise.
* gnu/packages/python.scm (python2-cssutils): Likewise.
gnu: openjpeg: Upgrade to 2.1.0.
* gnu/packages/image.scm (openjpeg): Upgrade to 2.1.0.
(openjpeg-2.0): New variable.
* gnu/packages/pdf.scm (mupdf)[inputs]: Use openjpeg-2.0.
Merge branch 'core-updates'
Conflicts:
gnu/packages/bootstrap.scm
gnu: libpng: Update to 1.5.21.
* gnu/packages/image.scm (libpng): Update to 1.5.21.
Merge branch 'master' into core-updates
gnu: openjpeg: Update to 2.0.1.
* gnu/packages/image.scm (openjpeg): Update to 2.0.1.