Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2018-03-29 17:34:41 +02:00
commit 5576cfabf3
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
124 changed files with 3344 additions and 1629 deletions

View file

@ -1320,6 +1320,9 @@ handling for most notations in use for IPv4 and IPv6 addresses and
networks.")
(license license:bsd-3)))
(define-public python2-ipy
(package-with-python2 python-ipy))
(define-public speedtest-cli
(package
(name "speedtest-cli")