guix - Guix

	Commit message (Collapse)	Author	Age
...
\| * \| \|	Merge branch 'master' into staging	Marius Bakke	2018-03-18
\| \|\ \ \
\| * \| \| \|	gnu: libdrm: Update to 2.4.91.	Marius Bakke	2018-03-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.91.
\| * \| \| \|	gnu: xf86-input-wacom: Update to 0.36.0.	Marius Bakke	2018-03-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (xf86-input-wacom): Update to 0.36.0.
\| * \| \| \|	gnu: libwacom: Update to 0.29.	Marius Bakke	2018-03-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libwacom): Update to 0.29.
\| * \| \| \|	Merge branch 'master' into staging	Marius Bakke	2018-03-01
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into staging	Marius Bakke	2018-02-20
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	gnu: libdrm: Update to 2.4.90.	Marius Bakke	2018-02-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.90.
* \| \| \| \| \|	gnu: rofi: Update to 1.5.1.	Marius Bakke	2018-03-20
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (rofi): Update to 1.5.1.
* \| \| \| \|	gnu: Fix common unquote typos.	Tobias Geerinckx-Rice	2018-03-17
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's easy to mistype ‘("foo" foo)’ as ‘("foo", foo)’ (which also works). Fix such typos for the proper edification of our young. * gnu/packages/android.scm: Move unquotes to their operands. * gnu/packages/bootloaders.scm: Likewise. * gnu/packages/build-tools.scm: Likewise. * gnu/packages/chemistry.scm: Likewise. * gnu/packages/compression.scm: Likewise. * gnu/packages/connman.scm: Likewise. * gnu/packages/django.scm: Likewise. * gnu/packages/emulators.scm: Likewise. * gnu/packages/engineering.scm: Likewise. * gnu/packages/file-systems.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gimp.scm: Likewise. * gnu/packages/gl.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/graphics.scm: Likewise. * gnu/packages/haskell.scm: Likewise. * gnu/packages/irc.scm: Likewise. * gnu/packages/julia.scm: Likewise. * gnu/packages/kde-frameworks.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/lua.scm: Likewise. * gnu/packages/mail.scm: Likewise. * gnu/packages/make-bootstrap.scm: Likewise. * gnu/packages/messaging.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/ocaml.scm: Likewise. * gnu/packages/perl.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/python-web.scm: Likewise. * gnu/packages/qt.scm: Likewise. * gnu/packages/ratpoison.scm: Likewise. * gnu/packages/sdl.scm: Likewise. * gnu/packages/sml.scm: Likewise. * gnu/packages/terminals.scm: Likewise. * gnu/packages/text-editors.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/virtualization.scm: Likewise. * gnu/packages/vulkan.scm: Likewise. * gnu/packages/wget.scm: Likewise. * gnu/packages/wine.scm: Likewise. * gnu/packages/wm.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/packages/xml.scm: Likewise. * gnu/packages/xorg.scm: Likewise.
* \| \| \|	gnu: rofi: Update redirected home page.	Marius Bakke	2018-03-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (rofi)[home-page]: Change to repository URL.
* \| \| \|	gnu: rofi: Update to 1.5.0.	Marius Bakke	2018-03-12
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (rofi): Update to 1.5.0. [native-inputs]: Add GLIB:BIN. [arguments]: Add phase to create missing test files.
* \| \|	gnu: Use HTTPS for supported freedesktop.org home pages.	Tobias Geerinckx-Rice	2018-02-26
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/fontutils.scm (fontconfig)[home-page]: Use HTTPS. * gnu/packages/freedesktop.scm (python-pyxdg, accountsservice) (modem-manager, telepathy-mission-control, telepathy-mission-control) (colord-gtk, desktop-file-utils)[home-page]: Likewise. * gnu/packages/ghostscript.scm (libspectre)[home-page]: Likewise. * gnu/packages/glib.scm (dbus, dbus-glib, telepathy-glib)[home-page]: Likewise. * gnu/packages/gnome.scm (shared-mime-info, hicolor-icon-theme) (libxklavier, colord, upower)[home-page]: Likewise. * gnu/packages/gstreamer.scm (orc, python-gst)[home-page]: Likewise. * gnu/packages/libcanberra.scm (sound-theme-freedesktop)[home-page]: Likewise. * gnu/packages/libreoffice.scm (libexttextcat)[home-page]: Likewise. * gnu/packages/polkit.scm (polkit-gnome, polkit-gnome)[home-page]: Likewise. * gnu/packages/pulseaudio.scm (pavucontrol)[home-page]: Likewise. * gnu/packages/python.scm (python-dbus)[home-page]: Likewise. * gnu/packages/xdisorg.scm (startup-notification)[home-page]: Likewise.
* \|	Merge branch 'master' into core-updates	Mark H Weaver	2018-02-16
\|\ \ \| \|/ \|/\|
\| *	gnu: Use HTTPS for supported nongnu.org home pages.	Tobias Geerinckx-Rice	2018-02-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/acl.scm (acl)[home-page]: Use HTTPS. * gnu/packages/admin.scm (dmidecode)[home-page]: Likewise. * gnu/packages/attr.scm (attr)[home-page]: Likewise. * gnu/packages/audio.scm (lash)[home-page]: Likewise. * gnu/packages/avr.scm (avr-libc)[home-page]: Likewise. * gnu/packages/backup.scm (rdiff-backup, libchop)[home-page]: Likewise. * gnu/packages/compression.scm (fastjar, lzip, lziprecover, atool) (lunzip, clzip, lzlib, plzip)[home-page]: Likewise. * gnu/packages/emacs.scm (geiser, bbdb, m17n-lib, m17n-lib)[home-page]: Likewise. * gnu/packages/flashing-tools.scm (avrdude)[home-page]: Likewise. * gnu/packages/fontutils.scm (libotf)[home-page]: Likewise. * gnu/packages/game-development.scm (gzochi)[home-page]: Likewise. * gnu/packages/games.scm (enigma)[home-page]: Likewise. * gnu/packages/gsasl.scm (libntlm)[home-page]: Likewise. * gnu/packages/gtk.scm (guile-cairo)[home-page]: Likewise. * gnu/packages/guile.scm (guile-reader, guile-lib, guile-json) (guile-redis, g-wrap)[home-page]: Likewise. * gnu/packages/libunwind.scm (libunwind)[home-page]: Likewise. * gnu/packages/lout.scm (lout)[home-page]: Likewise. * gnu/packages/mpd.scm (sonata)[home-page]: Likewise. * gnu/packages/networking.scm (quagga)[home-page]: Likewise. * gnu/packages/ratpoison.scm (ratpoison)[home-page]: Likewise. * gnu/packages/skribilo.scm (skribilo)[home-page]: Likewise. * gnu/packages/telephony.scm (exosip)[home-page]: Likewise. * gnu/packages/texinfo.scm (texi2html)[home-page]: Likewise. * gnu/packages/xdisorg.scm (xbindkeys)[home-page]: Likewise.
* \|	Merge branch 'master' into core-updates	Leo Famulari	2018-01-11
\|\\|
\| *	gnu: xscreensaver: Update to 5.38.	Marius Bakke	2018-01-09
\| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (xscreensaver): Update to 5.38.
* \|	Merge remote-tracking branch 'origin/master' into core-updates	Efraim Flashner	2017-12-31
\|\\|
\| *	gnu: Add libfakekey.	ng0	2017-12-30
\| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libfakekey): New variable. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
* \|	Merge branch 'master' into core-updates	Marius Bakke	2017-12-19
\|\\|
\| *	gnu: xf86-input-wacom: Update to 0.35.0.	Efraim Flashner	2017-12-08
\| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (xf86-input-wacom): Update to 0.35.0.
\| *	gnu: libwacom: Update to 0.26.	Efraim Flashner	2017-12-08
\| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libwacom): Update to 0.26.
* \|	gnu: libdrm: Update to 2.4.89.	Marius Bakke	2017-12-19
\| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.89.
* \|	Merge branch 'master' into core-updates	Marius Bakke	2017-12-07
\|\\|
\| *	gnu: xlockmore: Update to 5.55.	Tobias Geerinckx-Rice	2017-12-06
\| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (xlockmore): Update to 5.55.
\| *	gnu: xlockmore: Update source URIs and home page.	Tobias Geerinckx-Rice	2017-12-06
\| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (xlockmore)[source, home-page]: Use the new sillycycle.com domain.
* \|	Merge branch 'master' into core-updates	Marius Bakke	2017-12-05
\|\\|
\| *	gnu: Add xautolock.	Mike Gerwitz	2017-11-30
\| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (xautolock): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
* \|	gnu: libdrm: Update to 2.4.88.	Marius Bakke	2017-11-28
\| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.88.
* \|	gnu: check: Update to 0.12.0.	Marius Bakke	2017-11-28
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/check.scm (check): Update to 0.12.0. [source](uri): Update to new release URL. (check-0.11.0): Remove variable. * gnu/packages/xdisorg.scm (rofi)[native-inputs]: Replace CHECK-0.11.0 with CHECK.
* \|	Merge branch 'master' into core-updates	Marius Bakke	2017-11-19
\|\\|
\| *	gnu: Add nxbelld.	Marek Benc	2017-11-09
\| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (nxbelld): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
* \|	gnu: libdrm: Update to 2.4.87.	Marius Bakke	2017-11-01
\|/ \| \| \|	* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.87.
*	gnu: rofi: Update to 1.4.2.	Marius Bakke	2017-10-17
\| \| \| \|	* gnu/packages/xdisorg.scm (rofi): Update to 1.4.2.
*	Merge branch 'staging'	Marius Bakke	2017-10-10
\|\
\| *	gnu: libdrm: Disable etnaviv driver.	Marius Bakke	2017-10-06
\| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libdrm)<#:configure-flags>: On armhf-linux, don't build etnaviv driver.
\| *	Merge branch 'master' into staging	Marius Bakke	2017-10-05
\| \|\
\| * \|	gnu: Use 'modify-phases' syntax.	Kei Kebreau	2017-09-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/admin.scm (mingetty, clusterssh, wpa-supplicant-minimal, wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use 'modify-phases' syntax. * gnu/packages/algebra.scm (arb)[arguments]: Likewise. * gnu/packages/apr.scm (apr-util)[arguments]: Likewise. * gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano, lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound, zita-convolver, zita-alsa-pcmi)[arguments]: Likewise. * gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express, flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise. * gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise. * gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise. * gnu/packages/compression.scm (sharutils)[arguments]: Likewise. * gnu/packages/conky.scm (conky)[arguments]: Likewise. * gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise. * gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise. * gnu/packages/display-managers.scm (slim)[arguments]: Likewise. * gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise. * gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewise. * gnu/packages/engineering.scm (pcb)[arguments]: Likewise. * gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise. * gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise. * gnu/packages/fltk.scm (fltk)[arguments]: Likewise. * gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise. * gnu/packages/gd.scm (perl-gd)[arguments]: Likewise. * gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise. * gnu/packages/glib.scm (glibmm)[arguments]: Likewise. * gnu/packages/gl.scm (glew)[arguments]: Likewise. * gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-vfs, libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise. * gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise. * gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise. * gnu/packages/graphics.scm (agg)[arguments]: Likewise. * gnu/packages/gtk.scm (ganv, girara, gtksourceview-2, guile-present, python2-pycairo)[arguments]: Likewise. * gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise. * gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise. * gnu/packages/hugs.scm (hugs)[arguments]: Likewise. * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal) [arguments]: Likewise. * gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise. * gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise. * gnu/packages/linux.scm (bridge-utils, iw, fuse, unionfs-fuse/static, lm-sensors, i2c-tools, xsensors, perf, mdadm, libaio, module-init-tools) [arguments]: Likewise. * gnu/packages/lisp.scm (ccl)[arguments]: Likewise. * gnu/packages/lout.scm (lout)[arguments]: Likewise. * gnu/packages/lua.scm (luajit)[arguments]: Likewise. * gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise. * gnu/packages/mail.scm (exim)[arguments]: Likewise. * gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise. * gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun) [arguments]: Likewise. * gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise. * gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise. * gnu/packages/music.scm (solfege)[arguments]: Likewise. * gnu/packages/noweb.scm (noweb)[arguments]: Likewise. * gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]: Likewise. * gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu, zathura-pdf-poppler, zathura, podofo, fbida)[arguments]: Likewise. * gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]: Likewise. * gnu/packages/photo.scm (gphoto2)[arguments]: Likewise. * gnu/packages/popt.scm (popt)[arguments]: Likewise. * gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]: Likewise. * gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise. * gnu/packages/python.scm (python-passlib, python-pycrypto, python2-empy, python-sqlalchemy, python-docopt)[arguments]: Likewise. * gnu/packages/rdf.scm (lrdf)[arguments]: Likewise. * gnu/packages/regex.scm (tre)[arguments]: Likewise. * gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise. * gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise. * gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise. * gnu/packages/scheme.scm (racket)[arguments]: Likewise. * gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise. * gnu/packages/serveez.scm (serveez)[arguments]: Likewise. * gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise. * gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise. * gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise. * gnu/packages/tcl.scm (expect)[arguments]: Likewise. * gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise. * gnu/packages/textutils.scm (recode, libgtextutils)[arguments]: Likewise. * gnu/packages/time.scm (time)[arguments]: Likewise. * gnu/packages/tor.scm (privoxy)[arguments]: Likewise. * gnu/packages/uucp.scm (uucp)[arguments]: Likewise. * gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise. * gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise. * gnu/packages/web.scm (tinyproxy)[arguments]: Likewise. * gnu/packages/wicd.scm (wicd)[arguments]: Likewise. * gnu/packages/wm.scm (bspwm)[arguments]: Likewise. * gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise. * gnu/packages/xfce.scm (xfconf)[arguments]: Likewise. * gnu/packages/xfig.scm (transfig)[arguments]: Likewise. * gnu/packages/xorg.scm (imake)[arguments]: Likewise.
\| * \|	gnu: libdrm: Enable more drivers for arm and aarch64.	Efraim Flashner	2017-09-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libdrm)[arguments]: Add configure flags to enable experimental architecture-specific video drivers.
\| * \|	gnu: libdrm: Update to 2.4.83.	Marius Bakke	2017-09-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.83. [inputs]: Remove LIBPTHREAD-STUBS. [home-page]: Use HTTPS.
* \| \|	gnu: rofi: Update to 1.4.1.	Marius Bakke	2017-10-10
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	* gnu/packages/check.scm (check-0.11.0): New variable. * gnu/packages/xdisorg.scm (rofi): Update to 1.4.1. [inputs]: Add LIBRSVG. [native-inputs]: Add BISON, CHECK-0.11.0 and FLEX.
* \|	gnu: Add xautomation.	ng0	2017-09-29
\|/ \| \| \| \| \|	* gnu/packages/xdisorg.scm (xautomation): New variable. Signed-off-by: Kei Kebreau <kkebreau@posteo.net>
*	Merge branch 'core-updates'	Marius Bakke	2017-08-26
\|\
\| *	Merge branch 'master' into core-updates	Mark H Weaver	2017-08-15
\| \|\
\| * \	Merge branch 'master' into core-updates	Marius Bakke	2017-08-01
\| \|\ \
\| * \ \	Merge branch 'master' into core-updates	Leo Famulari	2017-07-23
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into core-updates	Leo Famulari	2017-07-10
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into core-updates	Mark H Weaver	2017-06-26
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into core-updates	Marius Bakke	2017-06-11
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: * gnu/packages/tls.scm (gnutls): Incorporated 3.5.13 graft (88e2511e217f2).
\| * \ \ \ \ \ \	Merge branch 'master' into core-updates	Marius Bakke	2017-06-10
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into core-updates	Leo Famulari	2017-06-07
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge commit includes a fix for CVE-2017-6512 in Perl 5.26.0.