gnu: gnupg: Remove #:prefix for (gnu packages compression).
* gnu/packages/gnupg.scm: Remove #:prefix for (gnu packages compression). Add #:prefix for (gnu packages license).
This commit is contained in:
parent
950d2ea414
commit
07157e8ab4
|
@ -20,14 +20,14 @@
|
||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages gnupg)
|
(define-module (gnu packages gnupg)
|
||||||
#:use-module (guix licenses)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (gnu packages curl)
|
#:use-module (gnu packages curl)
|
||||||
#:use-module (gnu packages openldap)
|
#:use-module (gnu packages openldap)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pth)
|
#:use-module (gnu packages pth)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
#:use-module ((gnu packages compression) #:prefix guix:)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
|
@ -56,7 +56,7 @@ (define-public libgpg-error
|
||||||
for all GnuPG components. Among these are GPG, GPGSM, GPGME,
|
for all GnuPG components. Among these are GPG, GPGSM, GPGME,
|
||||||
GPG-Agent, libgcrypt, Libksba, DirMngr, Pinentry, SmartCard
|
GPG-Agent, libgcrypt, Libksba, DirMngr, Pinentry, SmartCard
|
||||||
Daemon and possibly more in the future.")
|
Daemon and possibly more in the future.")
|
||||||
(license lgpl2.0+)))
|
(license license:lgpl2.0+)))
|
||||||
|
|
||||||
(define-public libgcrypt
|
(define-public libgcrypt
|
||||||
(package
|
(package
|
||||||
|
@ -90,7 +90,7 @@ (define-public libgcrypt
|
||||||
standard cryptographic building blocks such as symmetric ciphers, hash
|
standard cryptographic building blocks such as symmetric ciphers, hash
|
||||||
algorithms, public key algorithms, large integer functions and random number
|
algorithms, public key algorithms, large integer functions and random number
|
||||||
generation.")
|
generation.")
|
||||||
(license lgpl2.0+)))
|
(license license:lgpl2.0+)))
|
||||||
|
|
||||||
(define-public libgcrypt-1.5
|
(define-public libgcrypt-1.5
|
||||||
(package (inherit libgcrypt)
|
(package (inherit libgcrypt)
|
||||||
|
@ -127,7 +127,7 @@ (define-public libassuan
|
||||||
protocol. This protocol is used for IPC between most newer
|
protocol. This protocol is used for IPC between most newer
|
||||||
GnuPG components. Both, server and client side functions are
|
GnuPG components. Both, server and client side functions are
|
||||||
provided.")
|
provided.")
|
||||||
(license lgpl2.0+)))
|
(license license:lgpl2.0+)))
|
||||||
|
|
||||||
(define-public libksba
|
(define-public libksba
|
||||||
(package
|
(package
|
||||||
|
@ -160,7 +160,7 @@ (define-public libksba
|
||||||
"KSBA (pronounced Kasbah) is a library to make X.509 certificates
|
"KSBA (pronounced Kasbah) is a library to make X.509 certificates
|
||||||
as well as the CMS easily accessible by other applications. Both
|
as well as the CMS easily accessible by other applications. Both
|
||||||
specifications are building blocks of S/MIME and TLS.")
|
specifications are building blocks of S/MIME and TLS.")
|
||||||
(license gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public npth
|
(define-public npth
|
||||||
(package
|
(package
|
||||||
|
@ -185,7 +185,7 @@ (define-public npth
|
||||||
In contrast to GNU Pth is is based on the system's standard threads
|
In contrast to GNU Pth is is based on the system's standard threads
|
||||||
implementation. This allows the use of libraries which are not
|
implementation. This allows the use of libraries which are not
|
||||||
compatible to GNU Pth.")
|
compatible to GNU Pth.")
|
||||||
(license (list lgpl3+ gpl2+)))) ; dual license
|
(license (list license:lgpl3+ license:gpl2+)))) ; dual license
|
||||||
|
|
||||||
(define-public gnupg
|
(define-public gnupg
|
||||||
(package
|
(package
|
||||||
|
@ -200,7 +200,7 @@ (define-public gnupg
|
||||||
"14k7c5spai3yppz6izf1ggbnffskl54ln87v1wgy9pwism1mlks0"))))
|
"14k7c5spai3yppz6izf1ggbnffskl54ln87v1wgy9pwism1mlks0"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("bzip2" ,guix:bzip2)
|
`(("bzip2" ,bzip2)
|
||||||
("curl" ,curl)
|
("curl" ,curl)
|
||||||
("libassuan" ,libassuan)
|
("libassuan" ,libassuan)
|
||||||
("libgcrypt" ,libgcrypt)
|
("libgcrypt" ,libgcrypt)
|
||||||
|
@ -208,7 +208,7 @@ (define-public gnupg
|
||||||
("libksba" ,libksba)
|
("libksba" ,libksba)
|
||||||
("npth" ,npth)
|
("npth" ,npth)
|
||||||
("openldap" ,openldap)
|
("openldap" ,openldap)
|
||||||
("zlib" ,guix:zlib)
|
("zlib" ,zlib)
|
||||||
("readline" ,readline)))
|
("readline" ,readline)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
|
@ -227,7 +227,7 @@ (define-public gnupg
|
||||||
servers. It includes several libraries: libassuan (IPC between GnuPG
|
servers. It includes several libraries: libassuan (IPC between GnuPG
|
||||||
components), libgpg-error (centralized GnuPG error values), and
|
components), libgpg-error (centralized GnuPG error values), and
|
||||||
libskba (working with X.509 certificates and CMS data).")
|
libskba (working with X.509 certificates and CMS data).")
|
||||||
(license gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public gnupg-2.0
|
(define-public gnupg-2.0
|
||||||
(package (inherit gnupg)
|
(package (inherit gnupg)
|
||||||
|
@ -240,7 +240,7 @@ (define-public gnupg-2.0
|
||||||
(base32
|
(base32
|
||||||
"1wihx7dphacg9fy5wfj93h236lr1w5gwzh7ir3js37wi9cz6sr2p"))))
|
"1wihx7dphacg9fy5wfj93h236lr1w5gwzh7ir3js37wi9cz6sr2p"))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("bzip2" ,guix:bzip2)
|
`(("bzip2" ,bzip2)
|
||||||
("curl" ,curl)
|
("curl" ,curl)
|
||||||
("libassuan" ,libassuan)
|
("libassuan" ,libassuan)
|
||||||
("libgcrypt" ,libgcrypt)
|
("libgcrypt" ,libgcrypt)
|
||||||
|
@ -248,7 +248,7 @@ (define-public gnupg-2.0
|
||||||
("libksba" ,libksba)
|
("libksba" ,libksba)
|
||||||
("pth" ,pth)
|
("pth" ,pth)
|
||||||
("openldap" ,openldap)
|
("openldap" ,openldap)
|
||||||
("zlib" ,guix:zlib)
|
("zlib" ,zlib)
|
||||||
("readline" ,readline)))
|
("readline" ,readline)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
|
@ -270,8 +270,8 @@ (define-public gnupg-1
|
||||||
(base32
|
(base32
|
||||||
"11pxx26sfilh0vswylh9mhiifw5yffw7nn733zknw3sb0jfk22bz"))))
|
"11pxx26sfilh0vswylh9mhiifw5yffw7nn733zknw3sb0jfk22bz"))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("zlib" ,guix:zlib)
|
`(("zlib" ,zlib)
|
||||||
("bzip2" ,guix:bzip2)
|
("bzip2" ,bzip2)
|
||||||
("curl" ,curl)
|
("curl" ,curl)
|
||||||
("readline" ,readline)
|
("readline" ,readline)
|
||||||
("libgpg-error" ,libgpg-error)))
|
("libgpg-error" ,libgpg-error)))
|
||||||
|
@ -315,7 +315,7 @@ (define-public gpgme
|
||||||
programming task, it is suggested that all software should try to use GPGME
|
programming task, it is suggested that all software should try to use GPGME
|
||||||
instead. This way bug fixes or improvements can be done at a central place
|
instead. This way bug fixes or improvements can be done at a central place
|
||||||
and every application benefits from this.")
|
and every application benefits from this.")
|
||||||
(license lgpl2.1+)))
|
(license license:lgpl2.1+)))
|
||||||
|
|
||||||
(define-public pius
|
(define-public pius
|
||||||
(package
|
(package
|
||||||
|
@ -363,7 +363,7 @@ (define-public pius
|
||||||
|
|
||||||
pius-keyring-mgr and pius-party-worksheet help organisers of
|
pius-keyring-mgr and pius-party-worksheet help organisers of
|
||||||
PGP keysigning parties.")
|
PGP keysigning parties.")
|
||||||
(license gpl2)
|
(license license:gpl2)
|
||||||
(home-page "http://www.phildev.net/pius/index.shtml")))
|
(home-page "http://www.phildev.net/pius/index.shtml")))
|
||||||
|
|
||||||
(define-public signing-party
|
(define-public signing-party
|
||||||
|
@ -463,7 +463,7 @@ (define-public signing-party
|
||||||
;; gpl2+ for almost all programs, except for keyanalyze: gpl2
|
;; gpl2+ for almost all programs, except for keyanalyze: gpl2
|
||||||
;; and caff and gpgsigs: bsd-3, see
|
;; and caff and gpgsigs: bsd-3, see
|
||||||
;; http://packages.debian.org/changelogs/pool/main/s/signing-party/current/copyright
|
;; http://packages.debian.org/changelogs/pool/main/s/signing-party/current/copyright
|
||||||
(license gpl2)
|
(license license:gpl2)
|
||||||
(home-page "http://pgp-tools.alioth.debian.org/")))
|
(home-page "http://pgp-tools.alioth.debian.org/")))
|
||||||
|
|
||||||
(define-public pinentry
|
(define-public pinentry
|
||||||
|
@ -489,7 +489,7 @@ (define-public pinentry
|
||||||
(description
|
(description
|
||||||
"Pinentry provides a console and a GTK+ GUI that allows users to
|
"Pinentry provides a console and a GTK+ GUI that allows users to
|
||||||
enter a passphrase when `gpg' or `gpg2' is run and needs it.")
|
enter a passphrase when `gpg' or `gpg2' is run and needs it.")
|
||||||
(license gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public paperkey
|
(define-public paperkey
|
||||||
(package
|
(package
|
||||||
|
@ -521,4 +521,4 @@ (define-public paperkey
|
||||||
qualities. To reconstruct a secret key, you re-enter those
|
qualities. To reconstruct a secret key, you re-enter those
|
||||||
bytes (whether by hand, OCR, QR code, or the like) and paperkey can use
|
bytes (whether by hand, OCR, QR code, or the like) and paperkey can use
|
||||||
them to transform your existing public key into a secret key.")
|
them to transform your existing public key into a secret key.")
|
||||||
(license gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
Loading…
Reference in a new issue