gnupg*: Improve the meta set

And use version from gnupg21 for gnupg1compat.
This commit is contained in:
Michael Weiss 2017-03-27 21:47:38 +02:00
parent 02e469fa04
commit c9ecc70880
4 changed files with 48 additions and 27 deletions

View File

@ -12,10 +12,21 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
meta = { meta = with stdenv.lib; {
description = "Free implementation of the OpenPGP standard for encrypting and signing data"; homepage = "https://gnupg.org";
homepage = http://www.gnupg.org/; description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = stdenv.lib.platforms.gnu; # arbitrary choice longDescription = ''
The GNU Privacy Guard is the GNU project's complete and free
implementation of the OpenPGP standard as defined by RFC4880. GnuPG
"classic" (1.4) is the old standalone version which is most suitable for
older or embedded platforms. GnuPG allows to encrypt and sign your data
and communication, features a versatile key management system as well as
access modules for all kind of public key directories. GnuPG, also known
as GPG, is a command line tool with features for easy integration with
other applications. A wealth of frontend applications and libraries are
available.
'';
platforms = platforms.gnu; # arbitrary choice
}; };
} }

View File

@ -1,7 +1,7 @@
{ stdenv, gnupg, coreutils, writeScript }: { stdenv, gnupg, coreutils, writeScript }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnupg1compat-0"; name = "gnupg1compat-${gnupg.version}";
builder = writeScript "gnupg1compat-builder" '' builder = writeScript "gnupg1compat-builder" ''
# First symlink all top-level dirs # First symlink all top-level dirs
@ -18,7 +18,8 @@ stdenv.mkDerivation {
${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv ${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv
''; '';
meta = { meta = gnupg.meta // {
platforms = stdenv.lib.platforms.unix; description = gnupg.meta.description +
" with symbolic links for gpg and gpgv";
}; };
} }

View File

@ -44,24 +44,22 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
meta = { meta = with stdenv.lib; {
homepage = "http://gnupg.org/"; homepage = "https://gnupg.org";
description = "Free implementation of the OpenPGP standard for encrypting and signing data"; description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
longDescription = '' longDescription = ''
GnuPG is the GNU project's complete and free implementation of The GNU Privacy Guard is the GNU project's complete and free
the OpenPGP standard as defined by RFC4880. GnuPG allows to implementation of the OpenPGP standard as defined by RFC4880. GnuPG
encrypt and sign your data and communication, features a "stable" (2.0) is the current stable version for general use. This is
versatile key management system as well as access modules for all what most users are still using. GnuPG allows to encrypt and sign your
kind of public key directories. GnuPG, also known as GPG, is a data and communication, features a versatile key management system as well
command line tool with features for easy integration with other as access modules for all kind of public key directories. GnuPG, also
applications. A wealth of frontend applications and libraries known as GPG, is a command line tool with features for easy integration
are available. Version 2 of GnuPG also provides support for with other applications. A wealth of frontend applications and libraries
S/MIME. are available. Version 2 of GnuPG also provides support for S/MIME.
''; '';
maintainers = with maintainers; [ roconnor ];
maintainers = with stdenv.lib.maintainers; [ roconnor ]; platforms = platforms.all;
platforms = stdenv.lib.platforms.all;
}; };
} }

View File

@ -48,9 +48,20 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://gnupg.org; homepage = "https://gnupg.org";
description = "A complete and free implementation of the OpenPGP standard"; description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
longDescription = ''
The GNU Privacy Guard is the GNU project's complete and free
implementation of the OpenPGP standard as defined by RFC4880. GnuPG
"modern" (2.1) is the latest development with a lot of new features.
GnuPG allows to encrypt and sign your data and communication, features a
versatile key management system as well as access modules for all kind of
public key directories. GnuPG, also known as GPG, is a command line tool
with features for easy integration with other applications. A wealth of
frontend applications and libraries are available. Version 2 of GnuPG
also provides support for S/MIME.
'';
maintainers = with maintainers; [ wkennington peti fpletz vrthra ]; maintainers = with maintainers; [ wkennington peti fpletz vrthra ];
platforms = platforms.all; platforms = platforms.all;
}; };