amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2020-06-06 21:25:43 +02:00
commit 7ce1b5e7b7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
139 changed files with 4981 additions and 2034 deletions
Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/python-crypto.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2016, 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@ -612,22 +612,15 @@ library.")
(define-public python-axolotl-curve25519
(package
(name "python-axolotl-curve25519")
(version "0.1")
(version "0.4.1.post2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tgalal/python-axolotl-curve25519")
(commit "e4a9c4de0eae27223200579c58d1f8f6d20637e2")))
(file-name (string-append name "-" version "-checkout"))
(method url-fetch)
(uri (pypi-uri "python-axolotl-curve25519" version))
(sha256
(base32
"0agap5q0hmvf6cwzjqc05kw53pjgf6942pcivpazksmg1vk400ra"))))
"18v3rfyv7xi26fb97nw1xc0l6x8wi0i4xj8dlq4gblpbjxiac187"))))
(build-system python-build-system)
(arguments
`(;; Prevent creation of the egg. This works around
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765
#:configure-flags '("--root=/")))
(home-page "https://github.com/tgalal/python-axolotl-curve25519")
(synopsis "Python wrapper for curve25519 library")
(description "This is a python wrapper for the curve25519 library
@ -643,17 +636,14 @@ python-axolotl.")
(define-public python-axolotl
(package
(name "python-axolotl")
(version "0.1.39")
(version "0.2.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/tgalal/python-axolotl")
(commit version)))
(file-name (git-file-name name version))
(patches (search-patches "python-axolotl-AES-fix.patch"))
(method url-fetch)
(uri (pypi-uri "python-axolotl" version))
(sha256
(base32 "0xm9qgcwf6fq7rhzfcviwhbzcbj4i7wkxkab2z55fy1x82lya9g6"))))
(base32
"1bwdp24fmriffwx91aigs9k162albb51iskp23nc939z893q23py"))))
(build-system python-build-system)
(arguments
`(#:phases
@ -666,9 +656,8 @@ python-axolotl.")
#t)))))
(propagated-inputs
`(("python-axolotl-curve25519" ,python-axolotl-curve25519)
("python-dateutil" ,python-dateutil)
("python-protobuf" ,python-protobuf)
("python-pycrypto" ,python-pycrypto)))
("python-cryptography" ,python-cryptography)
("python-protobuf" ,python-protobuf)))
(home-page "https://github.com/tgalal/python-axolotl")
(synopsis "Python port of libaxolotl-android")
(description "This is a python port of libaxolotl-android. This