Merge branch 'up/libgcrypt' of github.com:ruediger/nixpkgs into ruediger-up/libgcrypt

This commit is contained in:
Aristid Breitkreuz 2014-08-29 18:25:02 +02:00
commit 22198c7691
2 changed files with 5 additions and 5 deletions

View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }: { fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgcrypt-1.6.1"; name = "libgcrypt-1.6.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "0w10vhpj1r5nq7qm6jp21p1v1vhf37701cw8yilygzzqd7mfzhx1"; sha256 = "de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c";
}; };
nativeBuildInputs = [ transfig ghostscript texinfo ]; nativeBuildInputs = [ transfig ghostscript texinfo ];
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
}; };
meta = { meta = {
description = "GNU Libgcrypt, a general-pupose cryptographic library"; description = "General-pupose cryptographic library";
longDescription = '' longDescription = ''
GNU Libgcrypt is a general purpose cryptographic library based on GNU Libgcrypt is a general purpose cryptographic library based on

View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, libgpgerror }: { fetchurl, stdenv, libgpgerror }:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "libgcrypt-1.5.3"; name = "libgcrypt-1.5.4";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw"; sha256 = "d5f88d9f41a46953dc250cdb8575129b37ee2208401b7fa338c897f667c7fb33";
}; };
propagatedBuildInputs = [ libgpgerror ]; propagatedBuildInputs = [ libgpgerror ];