nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: python-keyring: Update to 8.7. 

* gnu/packages/python.scm (python-keyring): Update to 8.7.
[native-inputs]: Remove python-setuptools, python-mock.
[properties]: Define python2-keyring.
(python2-keyring): Build with 'strip-python2-variant'.
[native-inputs]: Add python2-setuptools.
This commit is contained in:
Efraim Flashner 2016-04-10 18:02:32 +03:00
parent fe147c4143
commit 13f3ff3522
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/python.scm
View File

@ -835,19 +835,17 @@ etc.). The package is structured to make adding new modules easy.")
(define-public python-keyring (define-public python-keyring
(package (package
(name "python-keyring") (name "python-keyring")
(version "5.7.1") (version "8.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "keyring" version)) (uri (pypi-uri "keyring" version))
(sha256 (sha256
(base32 (base32
"1h7a1r9ick7wdd0xb5p63413nvjadna2xawrsvmklsl5ddhm5wrx")))) "0482rmi2x6p78wl2kz8qzyq21xz1sbbfwnv5x7dggar4vkwxhzfx"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-setuptools" ,python-setuptools) `(("python-setuptools-scm" ,python-setuptools-scm)))
("python-setuptools-scm" ,python-setuptools-scm)
("python-mock" ,python-mock)))
(inputs (inputs
`(("python-pycrypto" ,python-pycrypto))) `(("python-pycrypto" ,python-pycrypto)))
(arguments (arguments
@ -859,13 +857,15 @@ etc.). The package is structured to make adding new modules easy.")
service from python. It can be used in any application that needs safe service from python. It can be used in any application that needs safe
password storage.") password storage.")
;; "MIT" and PSF dual license ;; "MIT" and PSF dual license
(license x11))) (license x11)
(properties `((python2-variant . ,(delay python2-keyring))))))
(define-public python2-keyring (define-public python2-keyring
(let ((keyring (package-with-python2 python-keyring))) (let ((base (package-with-python2 (strip-python2-variant python-keyring))))
(package (inherit keyring) (package
(inputs (inherit base)
`(("python2-pycrypto" ,python2-pycrypto)))))) (native-inputs `(("python2-setuptools" ,python2-setuptools)
,@(package-native-inputs base))))))
(define-public python-six (define-public python-six
(package (package