Merge branch 'master' into python-build-system
gnu: packages: Use gettext-minimal. * gnu/packages/crypto.scm (tomb): Use 'gettext-minimal' instead of 'gnu-gettext'. * gnu/packages/emacs.scm (m17n-db): Likewise. * gnu/packages/ftp.scm (weex): Likewise. * gnu/packages/games.scm (chromium-bsu): Likewise. * gnu/packages/image.scm (steghide): Likewise. * gnu/packages/linux.scm (radeontop): Likewise. * gnu/packages/mpd.scm (sonata): Likewise. * gnu/packages/networking.scm (whois): Likewise. * gnu/packages/package-management.scm (guix-0.11.0): Likewise. * gnu/packages/psyc.scm (psyclpc): Likewise. * gnu/packages/syndication.scm (newsbeuter): Likewise. * gnu/packages/vim.scm (vim-full): Likewise.
gnu: wireshark: Update to 2.2.2. * gnu/packages/networking.scm (wireshark): Update to 2.2.2. Signed-off-by: 宋文武 <iyzsong@gmail.com>
Merge branch 'core-updates'
Merge branch 'master' into core-updates
gnu: wireshark: Use lua-5.2. * gnu/packages/networking.scm (wireshark)[inputs]: Change from 'lua' to 'lua-5.2'.
Merge branch 'master' into core-updates
gnu: whois: Update to 5.2.13. * gnu/packages/networking.scm (whois): Update to 5.2.13.
Merge branch 'master' into core-updates
gnu: Add nethogs. * gnu/packages/networking.scm (nethogs): New variable. Signed-off-by: Leo Famulari <leo@famulari.name>
Merge branch 'master' into core-updates
gnu: Add whois. * gnu/packages/networking.scm (whois): New variable. Signed-off-by: Marius Bakke <mbakke@fastmail.com>
Merge branch 'master' into core-updates
gnu: wireshark: Update to 2.2.1. * gnu/packages/networking.scm (wireshark): Update to 2.2.1. Signed-off-by: Leo Famulari <leo@famulari.name>
Merge branch 'master' into core-updates
gnu: Add iperf. * gnu/packages/networking.scm (iperf): New variable. Signed-off-by: Marius Bakke <mbakke@fastmail.com>
Merge branch 'master' into core-updates
gnu: Add sslh. * gnu/packages/networking.scm (sslh): New variable.
gnu: httping: Update to 2.5. * gnu/packages/networking.scm (httping): Update to 2.5.
Merge branch 'master' into core-updates