Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2018-02-01 13:18:47 +01:00
commit bee7bb315c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
81 changed files with 29301 additions and 907 deletions

View file

@ -450,7 +450,7 @@ python-axolotl.")
(define-public python-axolotl
(package
(name "python-axolotl")
(version "0.1.35")
(version "0.1.39")
(source
(origin
(method url-fetch)
@ -458,8 +458,9 @@ python-axolotl.")
"https://github.com/tgalal/python-axolotl/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(patches (search-patches "python-axolotl-AES-fix.patch"))
(sha256
(base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8"))))
(base32 "0badsgkgz0ir3hqynxzsfjgacppi874syvvmgccc6j164053x6zm"))))
(build-system python-build-system)
(arguments
`(#:phases