public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mass GnuPG upgrade

Browse Source 
gnupg tests fail. Will try to fix later.

svn path=/nixpkgs/trunk/; revision=21884
This commit is contained in:
Yury G. Kudryashov 2010-05-19 20:58:56 +00:00
parent ea1953d744
commit d0b56edcf2
6 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/gpgme/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth}: {stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gpgme-1.1.4"; name = "gpgme-1.3.0";
src = fetchurl { src = fetchurl {
url = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.bz2; url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
sha256 = "0ncrv7p33rjq1avkxpp9x0gz6wna9y3b3dmw6nv366n5mgvxmpg8"; sha256 = "18g6wgiacnbj437yfsczbjxaf041ljia48dnv2qgcqb0sky41q3l";
}; };
buildInputs = [libgpgerror gnupg pkgconfig glib pth]; buildInputs = [libgpgerror gnupg pkgconfig glib pth];
} }

8
pkgs/development/libraries/libassuan/default.nix
View File

@ -1,14 +1,14 @@
{ fetchurl, stdenv, pth }: { fetchurl, stdenv, pth, libgpgerror }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libassuan-1.0.5"; name = "libassuan-2.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/libassuan/${name}.tar.bz2"; url = "mirror://gnupg/libassuan/${name}.tar.bz2";
sha256 = "1xar8i5jmah75wa9my4x7vkc5b6nmzd2p6k9kmpdg9hsv04292y5"; sha256 = "13vzs4jxscnlskwzd3wpqwnfb5f0hwqc75rbi8j9f42bs6q08apx";
}; };
propagatedBuildInputs = [ pth ]; propagatedBuildInputs = [ pth libgpgerror ];
doCheck = true; doCheck = true;

8
pkgs/development/libraries/libksba/default.nix
View File

@ -1,11 +1,11 @@
args: with args; { stdenv, fetchurl, libgpgerror }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libksba-1.0.2"; name = "libksba-1.0.7";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnupg.org/gcrypt/libksba/${name}.tar.bz2"; url = "mirror://gnupg/libksba/${name}.tar.bz2";
sha256 = "1jkjh1daaykkrfq0s4vv8ddf0w8agdvspg9qm0ghjidlrfnsfiwh"; sha256 = "1biabl4ijaf0jyl4zf3qrhcs0iaq9pypjibp8wgnim3n3kg0bdda";
}; };
propagatedBuildInputs = [libgpgerror]; propagatedBuildInputs = [libgpgerror];

11
pkgs/tools/security/dirmngr/default.nix Normal file
View File

@ -0,0 +1,11 @@
{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, openldap }:
stdenv.mkDerivation rec {
name = "dirmngr-1.0.3";
src = fetchurl {
url = "mirror://gnupg/${name}.tar.bz2";
sha256 = "03f54582caxgwjdv1b71azyk612a738ckgk2k05bmg466r1cw8jd";
};
buildInputs = [ libgpgerror libgcrypt libassuan libksba openldap ];
}

6
pkgs/tools/security/gnupg/default.nix
View File

@ -25,7 +25,11 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional useUsb libusb ++ stdenv.lib.optional useUsb libusb
++ stdenv.lib.optional useCurl curl; ++ stdenv.lib.optional useCurl curl;
patchPhase = "sed -e 's@/bin/pwd@pwd@g' -i tests/pkits/*"; patchPhase = ''
find tests -type f | xargs sed -e 's@/bin/pwd@${stdenv.coreutils}&@g' -i
'';
checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";
postInstall = '' postInstall = ''
ln -s gpg2 $out/bin/gpg ln -s gpg2 $out/bin/gpg

6
pkgs/top-level/all-packages.nix
View File

@ -628,6 +628,10 @@ let
inherit fetchurl stdenv coreutils; inherit fetchurl stdenv coreutils;
}); });
dirmngr = import ../tools/security/dirmngr {
inherit stdenv fetchurl libgpgerror libgcrypt libassuan libksba openldap;
};
docbook2x = import ../tools/typesetting/docbook2x { docbook2x = import ../tools/typesetting/docbook2x {
inherit fetchurl stdenv texinfo perl inherit fetchurl stdenv texinfo perl
gnused groff libxml2 libxslt makeWrapper; gnused groff libxml2 libxslt makeWrapper;
@ -4301,7 +4305,7 @@ let
}; };
libassuan = import ../development/libraries/libassuan { libassuan = import ../development/libraries/libassuan {
inherit fetchurl stdenv pth; inherit fetchurl stdenv pth libgpgerror;
}; };
libavc1394 = import ../development/libraries/libavc1394 { libavc1394 = import ../development/libraries/libavc1394 {