Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Sat, 20 Jan 2018 04:59:20 +0000 (23:59 -0500)
committerMark H Weaver <mhw@netris.org>
Sat, 20 Jan 2018 04:59:20 +0000 (23:59 -0500)
commite074a655dd6497daafbd62737e3b63f3d5aa7985
tree2b198ba5c664cdd58e155f3c0113d1cebde0fc91
parent6d7b26a39faf42c37f15dc64a30a77e5e194ea23
parentccb5cac17be98aaa9c3225605d6170c675d8e8e6
Merge branch 'master' into core-updates
34 files changed:
Makefile.am
gnu/local.mk
gnu/packages/backup.scm
gnu/packages/check.scm
gnu/packages/compression.scm
gnu/packages/cups.scm
gnu/packages/databases.scm
gnu/packages/emacs.scm
gnu/packages/engineering.scm
gnu/packages/games.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnupg.scm
gnu/packages/haskell.scm
gnu/packages/image-viewers.scm
gnu/packages/java.scm
gnu/packages/linux.scm
gnu/packages/multiprecision.scm
gnu/packages/ncurses.scm
gnu/packages/package-management.scm
gnu/packages/pcre.scm
gnu/packages/photo.scm
gnu/packages/python-crypto.scm
gnu/packages/python.scm
gnu/packages/readline.scm
gnu/packages/ruby.scm
gnu/packages/tls.scm
gnu/packages/valgrind.scm
gnu/packages/version-control.scm
gnu/packages/video.scm
gnu/packages/xiph.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
guix/packages.scm