Merge branch 'master' into core-updates

This commit is contained in:
Mark H Weaver 2018-04-30 04:03:54 -04:00
commit 3d5ad159b3
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
105 changed files with 29149 additions and 23582 deletions

View file

@ -797,7 +797,7 @@ passphrase when @code{gpg} is run and needs it.")))
(define-public paperkey
(package
(name "paperkey")
(version "1.3")
(version "1.5")
(source (origin
(method url-fetch)
(uri (string-append "http://www.jabberwocky.com/"
@ -805,7 +805,7 @@ passphrase when @code{gpg} is run and needs it.")))
version ".tar.gz"))
(sha256
(base32
"1yybj8bj68v4lxwpn596b6ismh2fyixw5vlqqg26byrn4d9dfmsv"))))
"1prd2jaf4zjad3xhv160hmi5n408ssljfg7iz90jxs9w111pjwy4"))))
(build-system gnu-build-system)
(arguments
`(#:phases