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:
Efraim Flashner 2022-05-16 10:55:46 +03:00
commit e5e0e283ff
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
84 changed files with 8551 additions and 3357 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
@ -351,14 +351,10 @@ do what is needed for client/server Kerberos authentication based on
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest"))
#t)))))
(invoke "pytest" "-vv" "-c" "/dev/null" "tests")))))))
(native-inputs
(list python-toml
python-pytest
python-pytest-checkdocs
python-pytest-cov
python-pytest-flake8
python-setuptools
python-setuptools-scm))
(propagated-inputs
@ -370,30 +366,8 @@ do what is needed for client/server Kerberos authentication based on
service from python. It can be used in any application that needs safe
password storage.")
;; "MIT" and PSF dual license
(properties `((python2-variant . ,(delay python2-keyring))))
(license license:x11)))
(define-public python2-keyring
(let ((keyring (package-with-python2
(strip-python2-variant python-keyring))))
(package
(inherit keyring)
(name "python2-keyring")
(version "8.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "keyring" version))
(sha256
(base32
"0482rmi2x6p78wl2kz8qzyq21xz1sbbfwnv5x7dggar4vkwxhzfx"))))
(arguments
`(#:python ,python-2))
(native-inputs
(list python2-pytest python2-pytest-runner python2-setuptools-scm))
(propagated-inputs
(list python2-pycrypto)))))
(define-public python-keyrings.alt
(package
(name "python-keyrings.alt")